summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--requirements.txt1
-rw-r--r--requirements3.txt3
-rw-r--r--setup.py3
-rw-r--r--tox.ini3
4 files changed, 9 insertions, 1 deletions
diff --git a/requirements.txt b/requirements.txt
index 72c255d..5fec765 100644
--- 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 \ No newline at end of file
diff --git a/requirements3.txt b/requirements3.txt
new file mode 100644
index 0000000..a9da839
--- /dev/null
+++ b/requirements3.txt
@@ -0,0 +1,3 @@
+requests==2.5.3
+six>=1.4.0
+websocket-client==0.32.0 \ No newline at end of file
diff --git a/setup.py b/setup.py
index 6d86163..44cd164 100644
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,9 @@ requirements = [
'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
index 40e46fa..483c3ae 100644
--- 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