Skip to content

Commit 3623d8c

Browse files
authored
Merge pull request #11293 from sbidoul/testsuite-without-stdlib-distutils
Use default setuptools behaviour in our tests
2 parents 9351efd + a8d29f7 commit 3623d8c

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

noxfile.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ def test(session: nox.Session) -> None:
115115
*arguments,
116116
env={
117117
"LC_CTYPE": "en_US.UTF-8",
118-
"SETUPTOOLS_USE_DISTUTILS": "stdlib",
119118
},
120119
)
121120

@@ -245,7 +244,6 @@ def coverage(session: nox.Session) -> None:
245244
env={
246245
"COVERAGE_OUTPUT_DIR": "./.coverage-output",
247246
"COVERAGE_PROCESS_START": os.fsdecode(Path("setup.cfg").resolve()),
248-
"SETUPTOOLS_USE_DISTUTILS": "stdlib",
249247
},
250248
)
251249

src/pip/__pip-runner__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ def find_spec(
3030
return spec
3131

3232

33+
# TODO https://github.com/pypa/pip/issues/11294
3334
sys.meta_path.insert(0, PipImportRedirectingFinder())
3435

3536
assert __name__ == "__main__", "Cannot run __pip-runner__.py as a non-main module"

0 commit comments

Comments
 (0)