mirror of https://github.com/docker/docker-py.git
Use different requirements list on Python 2 and 3
In Python 3 websocker-client not required (and previously requiested version doesn't work at all).
This commit is contained in:
parent
375521d7e2
commit
5c850d4822
|
|
@ -0,0 +1,4 @@
|
|||
mock==1.0.1
|
||||
requests==2.2.1
|
||||
six>=1.3.0
|
||||
websocket-client==0.11.0
|
||||
8
setup.py
8
setup.py
|
|
@ -1,12 +1,18 @@
|
|||
#!/usr/bin/env python
|
||||
import os
|
||||
import sys
|
||||
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'
|
||||
|
||||
test_requirements = []
|
||||
with open('./requirements.txt') as requirements_txt:
|
||||
with open(requirements_file) as requirements_txt:
|
||||
requirements = [line for line in requirements_txt]
|
||||
|
||||
setup(
|
||||
|
|
|
|||
16
tox.ini
16
tox.ini
|
|
@ -2,12 +2,24 @@
|
|||
envlist = py26, py27, py32, py33, flake8
|
||||
skipsdist=True
|
||||
|
||||
[testenv]
|
||||
[testenv:py26]
|
||||
usedevelop=True
|
||||
commands =
|
||||
{envpython} tests/test.py
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
|
||||
[testenv:py27]
|
||||
usedevelop=True
|
||||
commands =
|
||||
{envpython} tests/test.py
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
|
||||
[testenv]
|
||||
usedevelop=True
|
||||
commands =
|
||||
{envpython} tests/test.py
|
||||
deps = -r{toxinidir}/requirements3.txt
|
||||
|
||||
[testenv:flake8]
|
||||
commands = flake8 docker tests
|
||||
deps = flake8
|
||||
deps = flake8
|
||||
|
|
|
|||
Loading…
Reference in New Issue