Bump Python SDK -> 3.5.0

Add support for Python 3.7

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-08-09 17:51:39 -07:00
parent f207d94b3c
commit 5ad50dc0b3
8 changed files with 12 additions and 10 deletions

View File

@ -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:

3
Jenkinsfile vendored
View File

@ -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)

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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',
],
)

View File

@ -1,5 +1,5 @@
[tox]
envlist = py27,py36,pre-commit
envlist = py27,py36,py37,pre-commit
[testenv]
usedevelop=True