Add py2-ipaddress dependency for python 2.x

Signed-off-by: Joffrey F <joffrey@docker.com>
docker · Mar 30, 2016 · b0e234e · b0e234e
1 parent 01cf62b
commit b0e234e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
 requests==2.5.3
 six>=1.4.0
 websocket-client==0.32.0
+py2-ipaddress==3.4.1
diff --git a/requirements3.txt b/requirements3.txt
@@ -0,0 +1,3 @@
+requests==2.5.3
+six>=1.4.0
+websocket-client==0.32.0
diff --git a/setup.py b/setup.py
@@ -12,6 +12,9 @@
     'websocket-client >= 0.32.0',
 ]
 
+if sys.version_info[0] == 2:
+    requirements.append('py2-ipaddress >= 3.4.1')
+
 exec(open('docker/version.py').read())
 
 with open('./test-requirements.txt') as test_reqs_txt:

diff --git a/tox.ini b/tox.ini
@@ -8,7 +8,8 @@ commands =
     py.test --cov=docker {posargs:tests/unit}
 deps =
     -r{toxinidir}/test-requirements.txt
-    -r{toxinidir}/requirements.txt
+    {py26,py27}: -r{toxinidir}/requirements.txt
+    {py33,py34}: -r{toxinidir}/requirements3.txt
 
 [testenv:flake8]
 commands = flake8 docker tests