Skip to content

Commit

Permalink
Install py.test>=2.8,<3
Browse files Browse the repository at this point in the history
The 3.x series is currently broken. Until py.test works again, 3.x
should not be used by anything.
  • Loading branch information
mx-moth committed Aug 29, 2016
1 parent f455ee4 commit c7c6522
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
- LC_ALL=C LC_CTYPE=C
script:
# avoid VersionConflict when newer version is required
- pip install -U pytest
- pip install -U 'pytest>=2.8,<3'

# Output the env, because the travis docs just can't be trusted
- env
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def pypi_link(pkg_filename):
tests_require=[
'setuptools[ssl]',
'pytest-flake8',
'pytest>=2.8,!=3.0.0',
'pytest>=2.8,<3',
] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
setup_requires=[
] + pytest_runner + wheel,
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
envlist = py26,py27,py33,py34,py35,pypy,pypy3

[testenv]
deps=
pytest-flake8
pytest>=2.8,<3
passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir
commands=python setup.py test
commands=python setup.py test --addopts='-rsx'

0 comments on commit c7c6522

Please sign in to comment.