Skip to content

[3.12] gh-109615: Fix support test_copy_python_src_ignore() (#109958) #110340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Oct 4, 2023
Merged

[3.12] gh-109615: Fix support test_copy_python_src_ignore() (#109958) #110340

merged 4 commits into from
Oct 4, 2023

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Oct 4, 2023 •
edited by bedevere-app bot
Loading

vstinner and others added 4 commits October 4, 2023 11:49
@vstinner
pythongh-109615: Fix support test_copy_python_src_ignore() (python#10…
b24ecb7 
…9958)

Fix the test when run on an installed Python: use "abs_srcdir" of
sysconfig, and skip the test if the Python source code cannot be
found.

* Tools/patchcheck/patchcheck.py, Tools/freeze/test/freeze.py and
  Lib/test/libregrtest/utils.py now first try to get "abs_srcdir"
  from sysconfig, before getting "srcdir" from sysconfig.
* test.pythoninfo logs sysconfig "abs_srcdir".

(cherry picked from commit b89ed9d)
@vstinner
pythongh-109615: Fix support test_copy_python_src_ignore() on WASM (p…
c310ecb 
…ython#109970)

Not only check if src_dir exists, but look also for Lib/os.py
landmark.

(cherry picked from commit cc54bcf)
@zooba @vstinner
pythongh-109615: Look for 'Modules' as landmark for test_copy_python_…
4f4c799 
…src_ignore (pythonGH-110108)

(cherry picked from commit 20bc5f7)
@vstinner
pythongh-109748: Fix again venv test_zippath_from_non_installed_posix…
a334057 
…() (python#110149)

Call also copy_python_src_ignore() on listdir() names.

shutil.copytree(): replace set() with an empty tuple. An empty tuple
becomes a constant in the compiler and checking if an item is in an
empty tuple is cheap.

(cherry picked from commit 0def8c7)
@vstinner vstinner requested a review from vsajip as a code owner October 4, 2023 09:54
This was referenced Oct 4, 2023
Closed
Merged
@vstinner vstinner enabled auto-merge (squash) October 4, 2023 09:56
@vstinner vstinner merged commit 8939221 into python:3.12 Oct 4, 2023
@vstinner vstinner deleted the copy_src32 branch October 4, 2023 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vsajip vsajip Awaiting requested review from vsajip vsajip is a code owner

Assignees
No one assigned
Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@vstinner @zooba