From 5c850d4822d44fcb4283ec18467421f902507362 Mon Sep 17 00:00:00 2001 From: Vladimir Rutsky Date: Mon, 17 Mar 2014 10:34:00 +0400 Subject: [PATCH] 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). --- requirements3.txt | 4 ++++ setup.py | 8 +++++++- tox.ini | 16 ++++++++++++++-- 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 requirements3.txt diff --git a/requirements3.txt b/requirements3.txt new file mode 100644 index 0000000000..b443a749ed --- /dev/null +++ b/requirements3.txt @@ -0,0 +1,4 @@ +mock==1.0.1 +requests==2.2.1 +six>=1.3.0 +websocket-client==0.11.0 diff --git a/setup.py b/setup.py index c0ba6d3b47..8c196f89d9 100644 --- a/setup.py +++ b/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( diff --git a/tox.ini b/tox.ini index f25f923619..7e36c20c56 100644 --- a/tox.ini +++ b/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 \ No newline at end of file +deps = flake8