summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml3
-rwxr-xr-xsetup.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index e32524cc..537e1755 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,9 @@ env:
- LC_ALL=C
- ""
script:
+ # avoid VersionConflict when newer version is required
+ - python -m pip install -U pytest
+
# update egg_info based on setup.py in checkout
- python bootstrap.py
diff --git a/setup.py b/setup.py
index 9d7f228d..dfb578a1 100755
--- a/setup.py
+++ b/setup.py
@@ -159,7 +159,7 @@ setup_params = dict(
scripts=[],
tests_require=[
'setuptools[ssl]',
- 'pytest',
+ 'pytest>=2.8',
] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
setup_requires=[
] + sphinx + pytest_runner,