gh-148690: Build Windows freethreaded binaries into separate directory and include python3t.dll on GIL-enabled#149218
gh-148690: Build Windows freethreaded binaries into separate directory and include python3t.dll on GIL-enabled#149218zooba wants to merge 24 commits intopython:mainfrom
Conversation
Co-authored-by: Steve Dower <steve.dower@microsoft.com> Co-authored-by: Nathan Goldbaum <nathan.goldbaum@gmail.com>
Documentation build overview
24 files changed ·
|
encukou
left a comment
There was a problem hiding this comment.
Thank you for taking this on!
|
I have a test release build running at https://dev.azure.com/Python/cpython/_build/results?buildId=169826&view=results If anyone wants to grab the results (look on the artifacts page for |
|
So far, I know that the PyManager packages are missing the |
|
Thanks for the ping! Unfortunately I have very limited time with my Windows PC today. I might be able to set up a VM using my ARM Macbook later on my plane, we'll see. After some quick inspection, I do see one possible issue with the GIL-enabled pymanager build: Shouldn't there be a python3t.dll next to python3.dll or in an I've attached the wheel file I built, renamed with a limited_api-1.2.3-cp315-abi3.abi3t-win_amd64.whl.zip I also did some brief testing with the msi installer along the lines of what I did in the other PR earlier this week and don't see any issues. |
|
oh I see you also caught that, great! |
|
Okay, I think this is the change now. We'll see if Canonical is back online for the tests, but this should be it on the Windows side. I'm still testing the updates to the release pipeline to make sure it still works for earlier versions, but that's a separate PR (python/release-tools#373) |
There was a problem hiding this comment.
For any other reviewers, here's the total diff between python3dll.vcxproj and python3tdll.vcxproj:
diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3tdll.vcxproj
index 3d8ac1b2353..796712cca31 100644
--- a/PCbuild/python3dll.vcxproj
+++ b/PCbuild/python3tdll.vcxproj
@@ -67,15 +67,15 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{885D4898-D08D-4091-9C40-C700CFE3FC5A}</ProjectGuid>
- <RootNamespace>python3dll</RootNamespace>
+ <ProjectGuid>{947BB5F5-6025-4A4F-8182-1B175469F8D2}</ProjectGuid>
+ <RootNamespace>python3tdll</RootNamespace>
<Keyword>Win32Proj</Keyword>
<SupportPGO>false</SupportPGO>
</PropertyGroup>
<Import Project="python.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
- <TargetName>python3</TargetName>
+ <TargetName>python3t</TargetName>
<ConfigurationType>DynamicLibrary</ConfigurationType>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -107,4 +107,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
zware
left a comment
There was a problem hiding this comment.
I see nothing that gives me pause here, but I'm not confident enough in my understanding to give it a green checkmark :)
|
🤖 New build scheduled with the buildbot fleet by @zooba for commit de2da65 🤖 Results will be shown at: https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F149218%2Fmerge If you want to schedule another build, you need to add the 🔨 test-with-buildbots label again. |
|
A buildbot run ought to flush out any of the remaining edge cases we have to worry about. Anything else will just have to be found in the beta, I guess. If someone else wants to merge when it passes, feel free. I probably won't see any results until after the weekend, which is getting very close to release. |
Based heavily on @encukou's work in #148912, split into a separate PR because I'm going to need my own branch for testing release process stuff.