mirror of https://github.com/docker/docker-py.git
commit
bc8ada2f74
23
.travis.yml
23
.travis.yml
|
@ -1,15 +1,18 @@
|
||||||
sudo: false
|
sudo: false
|
||||||
language: python
|
language: python
|
||||||
python:
|
matrix:
|
||||||
- "3.5"
|
include:
|
||||||
env:
|
- python: 2.7
|
||||||
- TOX_ENV=py27
|
env: TOXENV=py27
|
||||||
# FIXME: default travis worker does not carry py33 anymore. Can this be configured?
|
- python: 3.4
|
||||||
# - TOX_ENV=py33
|
env: TOXENV=py34
|
||||||
- TOX_ENV=py34
|
- python: 3.5
|
||||||
- TOX_ENV=py35
|
env: TOXENV=py35
|
||||||
- TOX_ENV=flake8
|
- python: 3.6
|
||||||
|
env: TOXENV=py36
|
||||||
|
- env: TOXENV=flake8
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- pip install tox
|
- pip install tox
|
||||||
script:
|
script:
|
||||||
- tox -e $TOX_ENV
|
- tox
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM python:3.5
|
FROM python:3.6
|
||||||
|
|
||||||
RUN mkdir /src
|
RUN mkdir /src
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
|
@ -27,7 +27,7 @@ def buildImages = { ->
|
||||||
imageNamePy3 = "${imageNameBase}:py3-${gitCommit()}"
|
imageNamePy3 = "${imageNameBase}:py3-${gitCommit()}"
|
||||||
|
|
||||||
buildImage(imageNamePy2, ".", "py2.7")
|
buildImage(imageNamePy2, ".", "py2.7")
|
||||||
buildImage(imageNamePy3, "-f Dockerfile-py3 .", "py3.5")
|
buildImage(imageNamePy3, "-f Dockerfile-py3 .", "py3.6")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
24
Makefile
24
Makefile
|
@ -3,7 +3,7 @@ all: test
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
-docker rm -vf dpy-dind
|
-docker rm -f dpy-dind-py2 dpy-dind-py3
|
||||||
find -name "__pycache__" | xargs rm -rf
|
find -name "__pycache__" | xargs rm -rf
|
||||||
|
|
||||||
.PHONY: build
|
.PHONY: build
|
||||||
|
@ -45,15 +45,25 @@ TEST_API_VERSION ?= 1.33
|
||||||
TEST_ENGINE_VERSION ?= 17.10.0-ce
|
TEST_ENGINE_VERSION ?= 17.10.0-ce
|
||||||
|
|
||||||
.PHONY: integration-dind
|
.PHONY: integration-dind
|
||||||
integration-dind: build build-py3
|
integration-dind: integration-dind-py2 integration-dind-py3
|
||||||
docker rm -vf dpy-dind || :
|
|
||||||
docker run -d --name dpy-dind --privileged dockerswarm/dind:${TEST_ENGINE_VERSION} dockerd\
|
.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
|
-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}"\
|
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}"\
|
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
|
--link=dpy-dind-py3:docker docker-sdk-python3 py.test tests/integration
|
||||||
docker rm -vf dpy-dind
|
docker rm -vf dpy-dind-py3
|
||||||
|
|
||||||
.PHONY: integration-dind-ssl
|
.PHONY: integration-dind-ssl
|
||||||
integration-dind-ssl: build-dind-certs build build-py3
|
integration-dind-ssl: build-dind-certs build build-py3
|
||||||
|
|
|
@ -3,7 +3,7 @@ version: '{branch}-{build}'
|
||||||
install:
|
install:
|
||||||
- "SET PATH=C:\\Python27-x64;C:\\Python27-x64\\Scripts;%PATH%"
|
- "SET PATH=C:\\Python27-x64;C:\\Python27-x64\\Scripts;%PATH%"
|
||||||
- "python --version"
|
- "python --version"
|
||||||
- "pip install tox==2.7.0 virtualenv==15.1.0"
|
- "pip install tox==2.9.1"
|
||||||
|
|
||||||
# Build the binary after tests
|
# Build the binary after tests
|
||||||
build: false
|
build: false
|
||||||
|
|
1
setup.py
1
setup.py
|
@ -87,6 +87,7 @@ setup(
|
||||||
'Programming Language :: Python :: 3.3',
|
'Programming Language :: Python :: 3.3',
|
||||||
'Programming Language :: Python :: 3.4',
|
'Programming Language :: Python :: 3.4',
|
||||||
'Programming Language :: Python :: 3.5',
|
'Programming Language :: Python :: 3.5',
|
||||||
|
'Programming Language :: Python :: 3.6',
|
||||||
'Topic :: Utilities',
|
'Topic :: Utilities',
|
||||||
'License :: OSI Approved :: Apache Software License',
|
'License :: OSI Approved :: Apache Software License',
|
||||||
],
|
],
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -1,5 +1,5 @@
|
||||||
[tox]
|
[tox]
|
||||||
envlist = py27, py33, py34, py35, flake8
|
envlist = py27, py33, py34, py35, py36, flake8
|
||||||
skipsdist=True
|
skipsdist=True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
-r requirements.txt
|
-r requirements.txt
|
||||||
pypiwin32==219
|
pypiwin32>=219
|
||||||
|
|
Loading…
Reference in New Issue