Skip to content

Commit 6e3dd3a

Browse files
committed
Avoid upgrading setuptools when creating the venv for distutils_adoption tests. Works around issue with upgrading on PyPy.
1 parent 39e3806 commit 6e3dd3a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ testing =
5959
wheel
6060
paver
6161
pip>=19.1 # For proper file:// URLs support.
62-
jaraco.envs
62+
jaraco.envs>=2.2
6363
pytest-xdist
6464
sphinx
6565
jaraco.path>=3.2.0

setuptools/tests/test_distutils_adoption.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
class VirtualEnv(jaraco.envs.VirtualEnv):
1616
name = '.env'
17+
create_opts = ['--no-setuptools']
1718

1819
def run(self, cmd, *args, **kwargs):
1920
cmd = [self.exe(cmd[0])] + cmd[1:]
@@ -61,7 +62,6 @@ def test_distutils_local_with_setuptools(venv):
6162
assert venv.name in loc.split(os.sep)
6263

6364

64-
@pytest.mark.xfail('IS_PYPY', reason='pypy imports distutils on startup')
6565
def test_distutils_local(venv):
6666
"""
6767
Even without importing, the setuptools-local copy of distutils is

0 commit comments

Comments
 (0)