Commit 7cb174c6 authored by Jason R. Coombs's avatar Jason R. Coombs

Force later pytest

parent df2fad04
...@@ -10,6 +10,9 @@ env: ...@@ -10,6 +10,9 @@ env:
- LC_ALL=C - LC_ALL=C
- "" - ""
script: script:
# avoid VersionConflict when newer version is required
- python -m pip install -U pytest
# update egg_info based on setup.py in checkout # update egg_info based on setup.py in checkout
- python bootstrap.py - python bootstrap.py
......
...@@ -159,7 +159,7 @@ setup_params = dict( ...@@ -159,7 +159,7 @@ setup_params = dict(
scripts=[], scripts=[],
tests_require=[ tests_require=[
'setuptools[ssl]', 'setuptools[ssl]',
'pytest', 'pytest>=2.8',
] + (['mock'] if sys.version_info[:2] < (3, 3) else []), ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
setup_requires=[ setup_requires=[
] + sphinx + pytest_runner, ] + sphinx + pytest_runner,
......
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