summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2021-11-10 14:45:56 -0500
committerJason R. Coombs <jaraco@jaraco.com>2021-11-10 14:45:56 -0500
commitd97e83e34d712330cf82427222cd141159e1f7f2 (patch)
tree0d706a0e053da001a7fc7ea9e9f9978208fcd649
parent5d21da70b7d9f75866d0f9f10f4ea54af74a95b1 (diff)
downloadpython-setuptools-git-d97e83e34d712330cf82427222cd141159e1f7f2.tar.gz
Get pytest-virtualenv from the pull request with distutils dependency removed.
-rw-r--r--setup.cfg2
-rw-r--r--tox.ini6
2 files changed, 2 insertions, 6 deletions
diff --git a/setup.cfg b/setup.cfg
index fdaf6c04..66cad330 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -55,7 +55,7 @@ testing =
mock
flake8-2020
virtualenv>=13.0.0
- pytest-virtualenv>=1.2.7
+ pytest-virtualenv @ git+https://github.com/jaraco/pytest-plugins@distutils-deprecated#subdirectory=pytest-virtualenv
wheel
paver
pip>=19.1 # For proper file:// URLs support.
diff --git a/tox.ini b/tox.ini
index 21fdd866..8940a182 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,11 +12,7 @@ deps =
# TODO: remove after Sphinx>4.1.2 is available.
sphinx@git+https://github.com/sphinx-doc/sphinx; python_version>="3.10"
commands =
- # We invoke pytest like this to avoid the warning:
- # UserWarning: Distutils was imported before Setuptools,
- # but importing Setuptools also replaces the `distutils`
- # module in `sys.modules`.
- pytest -c 'import setuptools; import pytest; pytest.main("{posargs}".split())'
+ pytest {posargs}
usedevelop = True
extras = testing
passenv =