From 5ad50dc0b3f978e4911dd24279c4d99d3bc3c51e Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Thu, 9 Aug 2018 17:51:39 -0700
Subject: [PATCH] Bump Python SDK -> 3.5.0 Add support for Python 3.7

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 .circleci/config.yml     | 2 +-
 Jenkinsfile              | 3 ++-
 appveyor.yml             | 2 +-
 requirements-dev.txt     | 2 +-
 requirements.txt         | 6 +++---
 script/build/windows.ps1 | 2 +-
 setup.py                 | 3 ++-
 tox.ini                  | 2 +-
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e3e798f51..f4e90d6de 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,7 +13,7 @@ jobs:
         command: sudo pip install --upgrade tox==2.1.1
     - run:
         name: unit tests
-        command: tox -e py27,py36 -- tests/unit
+        command: tox -e py27,py36,py37 -- tests/unit
 
   build-osx-binary:
     macos:
diff --git a/Jenkinsfile b/Jenkinsfile
index 44cd7c3c2..04f5cfbda 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -74,10 +74,11 @@ buildImage()
 def testMatrix = [failFast: true]
 def docker_versions = get_versions(2)
 
-for (int i = 0 ;i < docker_versions.length ; i++) {
+for (int i = 0; i < docker_versions.length; i++) {
   def dockerVersion = docker_versions[i]
   testMatrix["${dockerVersion}_py27"] = runTests([dockerVersions: dockerVersion, pythonVersions: "py27"])
   testMatrix["${dockerVersion}_py36"] = runTests([dockerVersions: dockerVersion, pythonVersions: "py36"])
+  testMatrix["${dockerVersion}_py37"] = runTests([dockerVersions: dockerVersion, pythonVersions: "py37"])
 }
 
 parallel(testMatrix)
diff --git a/appveyor.yml b/appveyor.yml
index f027a1180..da80d01d9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,7 +10,7 @@ install:
 build: false
 
 test_script:
-  - "tox -e py27,py36 -- tests/unit"
+  - "tox -e py27,py36,py37 -- tests/unit"
   - ps: ".\\script\\build\\windows.ps1"
 
 artifacts:
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 32c5c23a1..4d74f6d15 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,5 @@
 coverage==4.4.2
 flake8==3.5.0
 mock>=1.0.1
-pytest==2.9.2
+pytest==3.6.3
 pytest-cov==2.5.1
diff --git a/requirements.txt b/requirements.txt
index 96a98417e..41d21172e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.3.0
 certifi==2017.4.17
 chardet==3.0.4
-docker==3.4.1
+docker==3.5.0
 docker-pycreds==0.3.0
 dockerpty==0.4.1
 docopt==0.6.2
@@ -13,11 +13,11 @@ idna==2.5
 ipaddress==1.0.18
 jsonschema==2.6.0
 pypiwin32==219; sys_platform == 'win32' and python_version < '3.6'
-pypiwin32==220; sys_platform == 'win32' and python_version >= '3.6'
+pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6'
 PySocks==1.6.7
 PyYAML==3.12
 requests==2.19.1
 six==1.10.0
 texttable==0.9.1
-urllib3==1.21.1
+urllib3==1.21.1; python_version == '3.3'
 websocket-client==0.32.0
diff --git a/script/build/windows.ps1 b/script/build/windows.ps1
index 1de9bbfa4..41dc51e31 100644
--- a/script/build/windows.ps1
+++ b/script/build/windows.ps1
@@ -44,7 +44,7 @@ virtualenv .\venv
 # pip and pyinstaller generate lots of warnings, so we need to ignore them
 $ErrorActionPreference = "Continue"
 
-.\venv\Scripts\pip install pypiwin32==220
+.\venv\Scripts\pip install pypiwin32==223
 .\venv\Scripts\pip install -r requirements.txt
 .\venv\Scripts\pip install --no-deps .
 .\venv\Scripts\pip install -r requirements-build.txt
diff --git a/setup.py b/setup.py
index 213f66625..2819810c2 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ install_requires = [
     'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.20',
     'texttable >= 0.9.0, < 0.10',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker >= 3.4.1, < 4.0',
+    'docker >= 3.5.0, < 4.0',
     'dockerpty >= 0.4.1, < 0.5',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',
@@ -100,5 +100,6 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ],
 )
diff --git a/tox.ini b/tox.ini
index 33347df20..08efd4e68 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py36,pre-commit
+envlist = py27,py36,py37,pre-commit
 
 [testenv]
 usedevelop=True