KEMBAR78
[3.10] gh-135374: Adjust test for setuptools' replacement of distutils (GH-138796) by miss-islington · Pull Request #139303 · python/cpython · GitHub
Skip to content

Conversation

@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Sep 24, 2025

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

…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>
@encukou
Copy link
Member

encukou commented Sep 24, 2025

!buildbot Installed

@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @encukou for commit bb0e65d 🤖

Results will be shown at:

https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F139303%2Fmerge

The command will test the builders whose names match following regular expression: Installed

The builders matched are:

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

@encukou encukou requested a review from ambv September 24, 2025 14:49
@ambv ambv merged commit 91af026 into python:3.10 Sep 29, 2025
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip news tests Tests in the Lib/test dir

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants