Commit 4d035167 authored by Bruno Oliveira's avatar Bruno Oliveira

Use pytest>=3.0.2

The bug that lead to pin it (pytest-dev/pytest#1888) was fixed in 3.0.2
parent 336258f3
...@@ -12,7 +12,7 @@ env: ...@@ -12,7 +12,7 @@ env:
- LC_ALL=C LC_CTYPE=C - LC_ALL=C LC_CTYPE=C
script: script:
# avoid VersionConflict when newer version is required # avoid VersionConflict when newer version is required
- pip install -U 'pytest>=2.8,<3' - pip install -U 'pytest>=3.0.2'
# Output the env, because the travis docs just can't be trusted # Output the env, because the travis docs just can't be trusted
- env - env
......
...@@ -181,7 +181,7 @@ setup_params = dict( ...@@ -181,7 +181,7 @@ setup_params = dict(
tests_require=[ tests_require=[
'setuptools[ssl]', 'setuptools[ssl]',
'pytest-flake8', 'pytest-flake8',
'pytest>=2.8,<3', 'pytest>=3.0.2',
] + (['mock'] if sys.version_info[:2] < (3, 3) else []), ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
setup_requires=[ setup_requires=[
] + pytest_runner + wheel, ] + pytest_runner + wheel,
......
...@@ -4,6 +4,6 @@ envlist = py26,py27,py33,py34,py35,pypy,pypy3 ...@@ -4,6 +4,6 @@ envlist = py26,py27,py33,py34,py35,pypy,pypy3
[testenv] [testenv]
deps= deps=
pytest-flake8 pytest-flake8
pytest>=2.8,<3 pytest>=3.0.2
passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir
commands=python setup.py test --addopts='-rsx' commands=python setup.py test --addopts='-rsx'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment