summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2016-04-19 16:38:46 -0700
committerJoffrey F <joffrey@docker.com>2016-04-19 17:15:51 -0700
commitc76a914e019863339112f4b930155ab960be2b12 (patch)
treee701061a2fe6fd0c6f81c69208f30f6dd0e76d9a
parentcba2e973ec6341d08a4dbf6dc4fdad7cd5b3c727 (diff)
downloaddocker-py-c76a914e019863339112f4b930155ab960be2b12.tar.gz
Only install ipaddress if python version < 3.3felixonmars-backports
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--requirements.txt2
-rw-r--r--setup.py3
2 files changed, 2 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt
index c257d71..a79b7bf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,4 @@ requests==2.5.3
six>=1.4.0
websocket-client==0.32.0
backports.ssl_match_hostname>=3.5 ; python_version < '3.5'
-ipaddress ; python_version < '3.5' \ No newline at end of file
+ipaddress==1.0.16 ; python_version < '3.3' \ No newline at end of file
diff --git a/setup.py b/setup.py
index 57afd8b..fac5129 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
import os
-import sys
from setuptools import setup
ROOT_DIR = os.path.dirname(__file__)
@@ -14,7 +13,7 @@ requirements = [
extras_require = {
':python_version < "3.5"': 'backports.ssl_match_hostname >= 3.5',
- ':python_version < "3.5"': 'ipaddress',
+ ':python_version < "3.3"': 'ipaddress >= 1.0.16',
}
exec(open('docker/version.py').read())