Skip to content

Commit 8ffc1b2

Browse files
committed
Merge pull request #178 from rutsky/disable-websocker-on-py3
Use different requirements list on Python 2 and 3 (fixes #174)
2 parents beb8142 + 5c850d4 commit 8ffc1b2

File tree

3 files changed

+25
-3
lines changed

3 files changed

+25
-3
lines changed

requirements3.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
mock==1.0.1
2+
requests==2.2.1
3+
six>=1.3.0
4+
websocket-client==0.11.0

setup.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
#!/usr/bin/env python
22
import os
3+
import sys
34
from setuptools import setup
45

56
ROOT_DIR = os.path.dirname(__file__)
67
SOURCE_DIR = os.path.join(ROOT_DIR)
78

9+
if sys.version_info[0] == 3:
10+
requirements_file = './requirements3.txt'
11+
else:
12+
requirements_file = './requirements.txt'
13+
814
test_requirements = []
9-
with open('./requirements.txt') as requirements_txt:
15+
with open(requirements_file) as requirements_txt:
1016
requirements = [line for line in requirements_txt]
1117

1218
setup(

tox.ini

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,24 @@
22
envlist = py26, py27, py32, py33, flake8
33
skipsdist=True
44

5-
[testenv]
5+
[testenv:py26]
6+
usedevelop=True
7+
commands =
8+
{envpython} tests/test.py
9+
deps = -r{toxinidir}/requirements.txt
10+
11+
[testenv:py27]
612
usedevelop=True
713
commands =
814
{envpython} tests/test.py
915
deps = -r{toxinidir}/requirements.txt
1016

17+
[testenv]
18+
usedevelop=True
19+
commands =
20+
{envpython} tests/test.py
21+
deps = -r{toxinidir}/requirements3.txt
22+
1123
[testenv:flake8]
1224
commands = flake8 docker tests
13-
deps = flake8
25+
deps = flake8

0 commit comments

Comments
 (0)