Use pip environment markers for conditional dependencies

shin- · shin- · commit 241793b101e3 · 2016-03-30T11:37:17.000-07:00
Signed-off-by: Joffrey F &lt;joffrey@docker.com&gt;
diff --git a/Dockerfile-py3 b/Dockerfile-py3
@@ -4,7 +4,7 @@ MAINTAINER Joffrey F <joffrey@docker.com>
 RUN mkdir /home/docker-py
 WORKDIR /home/docker-py
 
-COPY requirements3.txt /home/docker-py/requirements.txt
+COPY requirements.txt /home/docker-py/requirements.txt
 RUN pip install -r requirements.txt
 
 COPY test-requirements.txt /home/docker-py/test-requirements.txt
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 requests==2.5.3
 six>=1.4.0
 websocket-client==0.32.0
-py2-ipaddress==3.4.1
+py2-ipaddress==3.4.1 ; python_version < '3.2'
diff --git a/requirements3.txt b/requirements3.txt
diff --git a/tox.ini b/tox.ini
@@ -8,8 +8,7 @@ commands =
     py.test --cov=docker {posargs:tests/unit}
 deps =
     -r{toxinidir}/test-requirements.txt
-    {py26,py27}: -r{toxinidir}/requirements.txt
-    {py33,py34}: -r{toxinidir}/requirements3.txt
+    -r{toxinidir}/requirements.txt
 
 [testenv:flake8]
 commands = flake8 docker tests
