[3.11] gh-135374: Adjust test for setuptools' replacement of distutils - #138796
Merged
ambv merged 2 commits intoSep 24, 2025
Merged
ambv merged 2 commits into
ambv merged 2 commits into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
ensurepip installs a bundled copy of distutils, which overrides the stdlib module. This affects several tests. This commit: - skips distutils in test___all__, as we're unlikely to break `__all__` in a security-fix-only branch (and if we do it's not much of a a big deal) - skips importability tests of distutils submodules if the setuptools hack is detected
Copy link
Copy Markdown
Member
Author
|
!buildbot Installed |
Sorry, something went wrong.
Copy link
Copy Markdown
|
🤖 New build scheduled with the buildbot fleet by @encukou for commit 86a50bf 🤖 Results will be shown at: https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F138796%2Fmerge The command will test the builders whose names match following regular expression: Installed The builders matched are:
|
Sorry, something went wrong.
Copy link
Copy Markdown
Member
Author
|
#138755 should fix the GHA failure. |
Sorry, something went wrong.
zware
approved these changes
Sep 11, 2025
zware
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
One cleanup suggestion, otherwise LGTM.
Sorry, something went wrong.
Comment thread
Lib/test/test_sundry.py
Copy link
Copy Markdown
Member
Author
|
FWIW, the distutits modules that aren't present in setuptools 79 are:
|
Sorry, something went wrong.
emmatyping
approved these changes
Sep 13, 2025
emmatyping
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
One typo fix, but otherwise looks good!
Sorry, something went wrong.
Comment thread
Lib/test/test___all__.py
Outdated
Co-authored-by: Emma Smith <emma@emmatyping.dev>
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Sep 24, 2025
…stutils (pythonGH-138796) ensurepip installs a bundled copy of distutils, which overrides the stdlib module. This affects several tests. This commit: - skips distutils in test___all__, as we're unlikely to break `__all__` in a security-fix-only branch (and if we do it's not much of a a big deal) - skips importability tests of distutils submodules if the setuptools hack is detected (cherry picked from commit 987af36) Co-authored-by: Petr Viktorin <encukou@gmail.com> Co-authored-by: Łukasz Langa <lukasz@langa.pl> Co-authored-by: Emma Smith <emma@emmatyping.dev>
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Sep 24, 2025
…stutils (pythonGH-138796) ensurepip installs a bundled copy of distutils, which overrides the stdlib module. This affects several tests. This commit: - skips distutils in test___all__, as we're unlikely to break `__all__` in a security-fix-only branch (and if we do it's not much of a a big deal) - skips importability tests of distutils submodules if the setuptools hack is detected (cherry picked from commit 987af36) Co-authored-by: Petr Viktorin <encukou@gmail.com> Co-authored-by: Łukasz Langa <lukasz@langa.pl> Co-authored-by: Emma Smith <emma@emmatyping.dev>
Copy link
Copy Markdown
|
GH-139303 is a backport of this pull request to the 3.10 branch. |
Sorry, something went wrong.
Copy link
Copy Markdown
|
GH-139304 is a backport of this pull request to the 3.9 branch. |
Sorry, something went wrong.
ambv
added a commit
that referenced
this pull request
Sep 29, 2025
GH-138796) (GH-139303) ensurepip installs a bundled copy of distutils, which overrides the stdlib module. This affects several tests. This commit: - skips distutils in test___all__, as we're unlikely to break `__all__` in a security-fix-only branch (and if we do it's not much of a a big deal) - skips importability tests of distutils submodules if the setuptools hack is detected (cherry picked from commit 987af36) Co-authored-by: Petr Viktorin <encukou@gmail.com> Co-authored-by: Łukasz Langa <lukasz@langa.pl> Co-authored-by: Emma Smith <emma@emmatyping.dev>
ambv
added a commit
that referenced
this pull request
Oct 7, 2025
…GH-138796) (GH-139304) ensurepip installs a bundled copy of distutils, which overrides the stdlib module. This affects several tests. This commit: - skips distutils in test___all__, as we're unlikely to break `__all__` in a security-fix-only branch (and if we do it's not much of a a big deal) - skips importability tests of distutils submodules if the setuptools hack is detected (cherry picked from commit 987af36) Co-authored-by: Petr Viktorin <encukou@gmail.com> Co-authored-by: Łukasz Langa <lukasz@langa.pl> Co-authored-by: Emma Smith <emma@emmatyping.dev>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Reviewers
Assignees
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ensurepip installs a bundled copy of distutils, which overrides the stdlib module. This affects several tests. This commit: