Skip to content

[3.11] gh-135374: Adjust test for setuptools' replacement of distutils - #138796

Merged
ambv merged 2 commits into
python:3.11from
encukou:setuptools-test-workaround
Sep 24, 2025
Merged

[3.11] gh-135374: Adjust test for setuptools' replacement of distutils#138796
ambv merged 2 commits into
python:3.11from
encukou:setuptools-test-workaround

Conversation

@encukou

@encukouencukou commented Sep 11, 2025•
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

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

@encukou
pythongh-135374: Adjust test for setuptools' replacement of distutils
86a50bf
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
@bedevere-appbedevere-appBot added awaiting core review tests Tests in the Lib/test dir labels Sep 11, 2025
@bedevere-appbedevere-appBot mentioned this pull request Sep 11, 2025
Closed
@encukou

encukou commented Sep 11, 2025

Copy link
Copy Markdown
MemberAuthor

!buildbot Installed

@bedevere-bot

bedevere-bot commented Sep 11, 2025

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:

  • x86 Debian Installed with X PR
  • AMD64 Fedora Stable Clang Installed PR
  • s390x Fedora Rawhide Clang Installed PR
  • AMD64 Fedora Rawhide Clang Installed PR
  • PPC64LE Fedora Rawhide Clang Installed PR
  • PPC64LE Fedora Stable Clang Installed PR
  • s390x Fedora Stable Clang Installed PR
  • aarch64 Fedora Rawhide Clang Installed PR
  • aarch64 Fedora Stable Clang Installed PR

@encukou

encukou commented Sep 11, 2025

Copy link
Copy Markdown
MemberAuthor

#138755 should fix the GHA failure.

zware
zware approved these changes Sep 11, 2025
View reviewed changes

@zwarezware left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One cleanup suggestion, otherwise LGTM.

Comment threadLib/test/test_sundry.py
@encukou

encukou commented Sep 12, 2025

Copy link
Copy Markdown
MemberAuthor

FWIW, the distutits modules that aren't present in setuptools 79 are:

emmatyping
emmatyping approved these changes Sep 13, 2025
View reviewed changes

@emmatypingemmatyping left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One typo fix, but otherwise looks good!

Comment threadLib/test/test___all__.py Outdated
@ambv@emmatyping
Update Lib/test/test___all__.py
abe584b
Co-authored-by: Emma Smith <emma@emmatyping.dev>
@ambv
ambv merged commit 987af36 into python:3.11Sep 24, 2025
21 checks passed
@miss-islington-app

miss-islington-appBot commented Sep 24, 2025

Copy link
Copy Markdown

Thanks @encukou for the PR, and @ambv for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9, 3.10.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 24, 2025
@encukou@ambv
@emmatyping@miss-islington
[3.11]pythongh-135374: Adjust test for setuptools' replacement of di…
bb0e65d
…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
@encukou@ambv
@emmatyping@miss-islington
[3.11]pythongh-135374: Adjust test for setuptools' replacement of di…
7ef179f
…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>
@bedevere-app

bedevere-appBot commented Sep 24, 2025

Copy link
Copy Markdown

GH-139303 is a backport of this pull request to the 3.10 branch.

@bedevere-appbedevere-appBot removed the needs backport to 3.10 only security fixes label Sep 24, 2025
@bedevere-app

bedevere-appBot commented Sep 24, 2025

Copy link
Copy Markdown

GH-139304 is a backport of this pull request to the 3.9 branch.

@encukou
encukou deleted the setuptools-test-workaround branch September 24, 2025 13:44
ambv added a commit that referenced this pull request Sep 29, 2025
@miss-islington@encukou
@ambv@emmatyping
[3.10]gh-135374: Adjust test for setuptools' replacement of distutils (
91af026
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
@miss-islington@encukou
@ambv@emmatyping
[3.9]gh-135374: Adjust test for setuptools' replacement of distutils (…
312de66
…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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zwarezwarezware approved these changes
@emmatypingemmatypingemmatyping approved these changes

Assignees

@ambvambv

Labels

skip newstestsTests in the Lib/test dir

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@encukou@bedevere-bot@zware@emmatyping@ambv