Skip to content

Commit be6c21a

Browse files
author
pgaref
committed
Disabling tox run from setup.py (as recommended from tox-dev) - enabling multiple python versions in travis conf file
1 parent af52f73 commit be6c21a

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
language: python
22
python:
3-
- 2.7
3+
- "2.7"
4+
- "3.2"
5+
- "3.3"
6+
- "3.4"
7+
- "3.5"
8+
- "3.6"
49
sudo: false
510
before_install:
611
- python --version

setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ def run_tests(self):
6060
include_package_data=True,
6161
platforms='any',
6262
test_suite='tests.test_parsers',
63-
tests_require=['tox'],
64-
cmdclass={'test': Tox},
65-
# tests_require=['pytest', 'pytest-cov'],
66-
# cmdclass={'test': PyTest},
63+
# tests_require=['tox'],
64+
# cmdclass={'test': Tox},
65+
tests_require=['pytest', 'pytest-cov'],
66+
cmdclass={'test': PyTest},
6767
install_requires=['beautifulsoup4 >= 4.5.3',
6868
'httmock>=1.2.6',
6969
'psutil>=5.1.3',

0 commit comments

Comments
 (0)