From 1a89991d2362867a9127e151376135615bc92a4c Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Fri, 30 May 2025 18:52:36 +0300 Subject: [PATCH 1/4] gh-134733: Fix documentation for the show_empty option of ast.dump() (GH-134925) Optional None values are always omitted. --- Doc/library/ast.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst index cf22250cac6091..ca0654acb33689 100644 --- a/Doc/library/ast.rst +++ b/Doc/library/ast.rst @@ -2445,8 +2445,9 @@ and classes for traversing abstract syntax trees: indents that many spaces per level. If *indent* is a string (such as ``"\t"``), that string is used to indent each level. - If *show_empty* is ``False`` (the default), empty lists and fields that are ``None`` - will be omitted from the output. + If *show_empty* is false (the default), optional empty lists will be + omitted from the output. + Optional ``None`` values are always omitted. .. versionchanged:: 3.9 Added the *indent* option. From 98a5b830d2463351800f4d76edba1a306a3e0ec9 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Fri, 30 May 2025 10:46:16 -0700 Subject: [PATCH 2/4] .gitignore personal Claude Code configs (#134942) .gitignore personal Claude Code configs. https://docs.anthropic.com/en/docs/claude-code/memory --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 2a6f249275c32e..a2542eaf7b698a 100644 --- a/.gitignore +++ b/.gitignore @@ -173,3 +173,7 @@ Python/frozen_modules/MANIFEST # main branch only: ABI files are not checked/maintained. Doc/data/python*.abi + +# People's custom https://docs.anthropic.com/en/docs/claude-code/memory configs. +/.claude/ +CLAUDE.local.md From 310c8cd5e5dcb0fb9509e08c0d5cf32075416878 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Fri, 30 May 2025 11:28:14 -0700 Subject: [PATCH 3/4] rearrange my gitingore addition w/comment to make backporting easier (#134945) --- .gitignore | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a2542eaf7b698a..cdb0352e0a8836 100644 --- a/.gitignore +++ b/.gitignore @@ -171,9 +171,10 @@ Python/frozen_modules/MANIFEST /python !/Python/ -# main branch only: ABI files are not checked/maintained. -Doc/data/python*.abi - # People's custom https://docs.anthropic.com/en/docs/claude-code/memory configs. /.claude/ CLAUDE.local.md + +#### main branch only stuff below this line, things to backport go above. #### +# main branch only: ABI files are not checked/maintained. +Doc/data/python*.abi From 8865b4f95b32097099d252111669b88ec7c1eb7f Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Fri, 30 May 2025 19:37:29 +0100 Subject: [PATCH 4/4] gh-134923: Use /GENPROFILE and /USEPROFILE for Windows PGO builds (GH-134924) --- .../2025-05-30-11-02-30.gh-issue-134923.gBkRg4.rst | 3 +++ PCbuild/_testclinic_limited.vcxproj | 1 + PCbuild/pyproject.props | 11 ++++------- 3 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 Misc/NEWS.d/next/Build/2025-05-30-11-02-30.gh-issue-134923.gBkRg4.rst diff --git a/Misc/NEWS.d/next/Build/2025-05-30-11-02-30.gh-issue-134923.gBkRg4.rst b/Misc/NEWS.d/next/Build/2025-05-30-11-02-30.gh-issue-134923.gBkRg4.rst new file mode 100644 index 00000000000000..a742a6add8ae93 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2025-05-30-11-02-30.gh-issue-134923.gBkRg4.rst @@ -0,0 +1,3 @@ +Windows builds with profile-guided optimization enabled now use +``/GENPROFILE`` and ``/USEPROFILE`` instead of deprecated ``/LTCG:`` +options. diff --git a/PCbuild/_testclinic_limited.vcxproj b/PCbuild/_testclinic_limited.vcxproj index 183a55080e8693..95c205309b1f30 100644 --- a/PCbuild/_testclinic_limited.vcxproj +++ b/PCbuild/_testclinic_limited.vcxproj @@ -70,6 +70,7 @@ {01FDF29A-40A1-46DF-84F5-85EBBD2A2410} _testclinic_limited Win32Proj + false diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 7272542e13a5ca..ce51e342241686 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -96,19 +96,16 @@ MachineX64 MachineARM MachineARM64 - $(OutDir)$(TargetName).pgd - UseLinkTimeCodeGeneration - PGInstrument - PGUpdate + UseLinkTimeCodeGeneration advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;%(AdditionalDependencies) /OPT:REF,NOICF %(AdditionalOptions) -d2:-pattern-opt-disable:-932189325 %(AdditionalOptions) + /GENPROFILE %(AdditionalOptions) + /USEPROFILE %(AdditionalOptions) false - true - true - true + true $(PySourcePath)PC;$(PySourcePath)Include;$(IntDir);%(AdditionalIncludeDirectories)