Skip to content

Commit

Permalink
Merge pull request #917 from DWesl/virtualenv-removed-no-site-packages
Browse files Browse the repository at this point in the history
Virtualenv no longer supports --no-site-packages; remove it.
  • Loading branch information
pv authored May 14, 2020
2 parents d0c9bfa + 44118af commit 3ef7c50
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion asv/plugins/virtualenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ def _setup(self):
util.check_call([
sys.executable,
"-mvirtualenv",
'--no-site-packages',
"-p",
self._executable,
self._path], env=env)
Expand Down
11 changes: 7 additions & 4 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

0 comments on commit 3ef7c50

Please sign in to comment.