mirror of https://github.com/docker/docker-py.git
Add py2-ipaddress dependency for python 2.x
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
parent
01cf62b4a3
commit
b0e234eb0c
|
@ -1,3 +1,4 @@
|
||||||
requests==2.5.3
|
requests==2.5.3
|
||||||
six>=1.4.0
|
six>=1.4.0
|
||||||
websocket-client==0.32.0
|
websocket-client==0.32.0
|
||||||
|
py2-ipaddress==3.4.1
|
|
@ -0,0 +1,3 @@
|
||||||
|
requests==2.5.3
|
||||||
|
six>=1.4.0
|
||||||
|
websocket-client==0.32.0
|
3
setup.py
3
setup.py
|
@ -12,6 +12,9 @@ requirements = [
|
||||||
'websocket-client >= 0.32.0',
|
'websocket-client >= 0.32.0',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
if sys.version_info[0] == 2:
|
||||||
|
requirements.append('py2-ipaddress >= 3.4.1')
|
||||||
|
|
||||||
exec(open('docker/version.py').read())
|
exec(open('docker/version.py').read())
|
||||||
|
|
||||||
with open('./test-requirements.txt') as test_reqs_txt:
|
with open('./test-requirements.txt') as test_reqs_txt:
|
||||||
|
|
3
tox.ini
3
tox.ini
|
@ -8,7 +8,8 @@ commands =
|
||||||
py.test --cov=docker {posargs:tests/unit}
|
py.test --cov=docker {posargs:tests/unit}
|
||||||
deps =
|
deps =
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
-r{toxinidir}/requirements.txt
|
{py26,py27}: -r{toxinidir}/requirements.txt
|
||||||
|
{py33,py34}: -r{toxinidir}/requirements3.txt
|
||||||
|
|
||||||
[testenv:flake8]
|
[testenv:flake8]
|
||||||
commands = flake8 docker tests
|
commands = flake8 docker tests
|
||||||
|
|
Loading…
Reference in New Issue