summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Nephin <dnephin@gmail.com>2014-08-08 11:10:26 -0400
committerDaniel Nephin <dnephin@gmail.com>2014-08-08 11:10:26 -0400
commit59c6d5c586195b5db9fd449ec353726cd111ce22 (patch)
treee122f1a0fb05ece53c8a2f3ae6ac175edbbed5d1
parent14f9c07b01b57b58b447bd6a1145d1c0e1a72f88 (diff)
downloaddocker-py-59c6d5c586195b5db9fd449ec353726cd111ce22.tar.gz
Resolves #101, don't use pinned dependencies.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
-rw-r--r--setup.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/setup.py b/setup.py
index 0055cd6..b63cc92 100644
--- a/setup.py
+++ b/setup.py
@@ -6,17 +6,19 @@ from setuptools import setup
ROOT_DIR = os.path.dirname(__file__)
SOURCE_DIR = os.path.join(ROOT_DIR)
-if sys.version_info[0] == 3:
- requirements_file = './requirements3.txt'
-else:
- requirements_file = './requirements.txt'
+requirements = [
+ 'requests >= 2.2.1',
+ 'six >= 1.3.0',
+]
+
+if sys.version_info[0] < 3:
+ requirements.append('websocket-client >= 0.11.0')
exec(open('docker/version.py').read())
with open('./test-requirements.txt') as test_reqs_txt:
test_requirements = [line for line in test_reqs_txt]
-with open(requirements_file) as requirements_txt:
- requirements = [line for line in requirements_txt]
+
setup(
name="docker-py",
@@ -24,7 +26,8 @@ setup(
description="Python client for Docker.",
packages=['docker', 'docker.auth', 'docker.unixconn', 'docker.utils',
'docker.ssladapter'],
- install_requires=requirements + test_requirements,
+ install_requires=requirements,
+ tests_require=test_requirements,
zip_safe=False,
test_suite='tests',
classifiers=[