Skip to content

Commit b0e234e

Browse files
committed
Add py2-ipaddress dependency for python 2.x
Signed-off-by: Joffrey F <[email protected]>
1 parent 01cf62b commit b0e234e

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
requests==2.5.3
22
six>=1.4.0
33
websocket-client==0.32.0
4+
py2-ipaddress==3.4.1

requirements3.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
requests==2.5.3
2+
six>=1.4.0
3+
websocket-client==0.32.0

setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
'websocket-client >= 0.32.0',
1313
]
1414

15+
if sys.version_info[0] == 2:
16+
requirements.append('py2-ipaddress >= 3.4.1')
17+
1518
exec(open('docker/version.py').read())
1619

1720
with open('./test-requirements.txt') as test_reqs_txt:

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ commands =
88
py.test --cov=docker {posargs:tests/unit}
99
deps =
1010
-r{toxinidir}/test-requirements.txt
11-
-r{toxinidir}/requirements.txt
11+
{py26,py27}: -r{toxinidir}/requirements.txt
12+
{py33,py34}: -r{toxinidir}/requirements3.txt
1213

1314
[testenv:flake8]
1415
commands = flake8 docker tests

0 commit comments

Comments
 (0)