diff --git a/.travis.yml b/.travis.yml index 2643b2ed0..fb250eb0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,9 @@ install: $TRAVIS_PIP install virtualenv numpy scipy; fi fi + if $TRAVIS_PYTHON -c 'import sys; sys.exit(0 if "__pypy__" in sys.modules else 1)'; then + $TRAVIS_PIP install "pytest>=4.4.0,<5.0" "pytest-rerunfailures>=8.0,<9.0" "pytest-faulthandler<2.0" + fi $TRAVIS_PIP install selenium six "pytest>=4.4.0" "pytest-xdist" pytest-rerunfailures pytest-faulthandler pytest-timeout feedparser python-hglib filelock; if [[ "$COVERAGE" != '' ]]; then $TRAVIS_PIP install pytest-cov codecov; fi; - $TRAVIS_PYTHON setup.py build_ext -i diff --git a/asv/plugins/virtualenv.py b/asv/plugins/virtualenv.py index a1595d5c2..166b92961 100644 --- a/asv/plugins/virtualenv.py +++ b/asv/plugins/virtualenv.py @@ -140,7 +140,6 @@ def _setup(self): util.check_call([ sys.executable, "-mvirtualenv", - '--no-site-packages', "-p", self._executable, self._path], env=env) diff --git a/requirements-dev.txt b/requirements-dev.txt index 47bf1eb6e..c75220b80 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,6 @@ -pytest>=4.4.0 -virtualenv +pytest>=4.4.0; platform_python_implementation != "PyPy" +pytest>=4.4.0,<5.0; platform_python_implementation == "PyPy" +virtualenv>=1.7 filelock six pip @@ -10,8 +11,10 @@ numpy scipy selenium pytest-xdist -pytest-rerunfailures -pytest-faulthandler +pytest-rerunfailures>=8.0; platform_python_implementation != "PyPy" +pytest-rerunfailures>=8.0,<9.0; platform_python_implementation == "PyPy" +pytest-faulthandler; platform_python_implementation != "PyPy" +pytest-faulthandler<2.0; platform_python_implementation == "PyPy" pytest-timeout feedparser python-hglib