Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Virtualenv no longer supports --no-site-packages; remove it. #917

Merged
merged 6 commits into from
May 14, 2020
Merged

Virtualenv no longer supports --no-site-packages; remove it. #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fb631f4
Virtualenv no longer supports --no-site-packages; remove it.
DWesl May 11, 2020
f2735df
Update requirements for PyPy.
DWesl May 11, 2020
aaf4714
platform_python_implementation "pypy" -> "PyPy"
DWesl May 11, 2020
f6f9217
Fix spelling of ">="
DWesl May 11, 2020
f7564c5
Change travis install list to match requirements-dev.txt
DWesl May 11, 2020
44118af
Try to get the correct version of rerunfailures installed.
DWesl May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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