diff options
| -rw-r--r-- | .travis.yml | 23 | ||||
| -rw-r--r-- | Dockerfile-py3 | 2 | ||||
| -rw-r--r-- | Jenkinsfile | 2 | ||||
| -rw-r--r-- | Makefile | 24 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | tox.ini | 2 | ||||
| -rw-r--r-- | win32-requirements.txt | 2 |
8 files changed, 36 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml index cd64b44..842e352 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,18 @@ sudo: false language: python -python: - - "3.5" -env: - - TOX_ENV=py27 -# FIXME: default travis worker does not carry py33 anymore. Can this be configured? -# - TOX_ENV=py33 - - TOX_ENV=py34 - - TOX_ENV=py35 - - TOX_ENV=flake8 +matrix: + include: + - python: 2.7 + env: TOXENV=py27 + - python: 3.4 + env: TOXENV=py34 + - python: 3.5 + env: TOXENV=py35 + - python: 3.6 + env: TOXENV=py36 + - env: TOXENV=flake8 + install: - pip install tox script: - - tox -e $TOX_ENV + - tox diff --git a/Dockerfile-py3 b/Dockerfile-py3 index 543cf4d..d558ba3 100644 --- a/Dockerfile-py3 +++ b/Dockerfile-py3 @@ -1,4 +1,4 @@ -FROM python:3.5 +FROM python:3.6 RUN mkdir /src WORKDIR /src diff --git a/Jenkinsfile b/Jenkinsfile index e3168cd..6dc9a32 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ def buildImages = { -> imageNamePy3 = "${imageNameBase}:py3-${gitCommit()}" buildImage(imageNamePy2, ".", "py2.7") - buildImage(imageNamePy3, "-f Dockerfile-py3 .", "py3.5") + buildImage(imageNamePy3, "-f Dockerfile-py3 .", "py3.6") } } } @@ -3,7 +3,7 @@ all: test .PHONY: clean clean: - -docker rm -vf dpy-dind + -docker rm -f dpy-dind-py2 dpy-dind-py3 find -name "__pycache__" | xargs rm -rf .PHONY: build @@ -45,15 +45,25 @@ TEST_API_VERSION ?= 1.33 TEST_ENGINE_VERSION ?= 17.10.0-ce .PHONY: integration-dind -integration-dind: build build-py3 - docker rm -vf dpy-dind || : - docker run -d --name dpy-dind --privileged dockerswarm/dind:${TEST_ENGINE_VERSION} dockerd\ +integration-dind: integration-dind-py2 integration-dind-py3 + +.PHONY: integration-dind-py2 +integration-dind-py2: build + docker rm -vf dpy-dind-py2 || : + docker run -d --name dpy-dind-py2 --privileged dockerswarm/dind:${TEST_ENGINE_VERSION} dockerd\ -H tcp://0.0.0.0:2375 --experimental docker run -t --rm --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TEST_API_VERSION=${TEST_API_VERSION}"\ - --link=dpy-dind:docker docker-sdk-python py.test tests/integration + --link=dpy-dind-py2:docker docker-sdk-python py.test tests/integration + docker rm -vf dpy-dind-py3 + +.PHONY: integration-dind-py3 +integration-dind-py3: build-py3 + docker rm -vf dpy-dind-py3 || : + docker run -d --name dpy-dind-py3 --privileged dockerswarm/dind:${TEST_ENGINE_VERSION} dockerd\ + -H tcp://0.0.0.0:2375 --experimental docker run -t --rm --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TEST_API_VERSION=${TEST_API_VERSION}"\ - --link=dpy-dind:docker docker-sdk-python3 py.test tests/integration - docker rm -vf dpy-dind + --link=dpy-dind-py3:docker docker-sdk-python3 py.test tests/integration + docker rm -vf dpy-dind-py3 .PHONY: integration-dind-ssl integration-dind-ssl: build-dind-certs build build-py3 diff --git a/appveyor.yml b/appveyor.yml index 41cde62..d659b58 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ version: '{branch}-{build}' install: - "SET PATH=C:\\Python27-x64;C:\\Python27-x64\\Scripts;%PATH%" - "python --version" - - "pip install tox==2.7.0 virtualenv==15.1.0" + - "pip install tox==2.9.1" # Build the binary after tests build: false @@ -87,6 +87,7 @@ setup( 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', 'Topic :: Utilities', 'License :: OSI Approved :: Apache Software License', ], @@ -1,5 +1,5 @@ [tox] -envlist = py27, py33, py34, py35, flake8 +envlist = py27, py33, py34, py35, py36, flake8 skipsdist=True [testenv] diff --git a/win32-requirements.txt b/win32-requirements.txt index e77c3d9..6db52a5 100644 --- a/win32-requirements.txt +++ b/win32-requirements.txt @@ -1,2 +1,2 @@ -r requirements.txt -pypiwin32==219
\ No newline at end of file +pypiwin32>=219 |