Kaydet (Commit) 241793b1 authored tarafından Joffrey F's avatar Joffrey F

Use pip environment markers for conditional dependencies

Signed-off-by: 's avatarJoffrey F <joffrey@docker.com>
üst 88790781
......@@ -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
......
requests==2.5.3
six>=1.4.0
websocket-client==0.32.0
py2-ipaddress==3.4.1
\ No newline at end of file
py2-ipaddress==3.4.1 ; python_version < '3.2'
\ No newline at end of file
requests==2.5.3
six>=1.4.0
websocket-client==0.32.0
\ No newline at end of file
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment