Fix missing Include/pyconfig.h in 3.13 Windows onedirs#284
Merged
dwoz merged 1 commit intosaltstack:mainfrom May 4, 2026
Merged
Fix missing Include/pyconfig.h in 3.13 Windows onedirs#284dwoz merged 1 commit intosaltstack:mainfrom
dwoz merged 1 commit intosaltstack:mainfrom
Conversation
Python <= 3.12 ships PC/pyconfig.h. Python 3.13+ replaced that file with
PC/pyconfig.h.in and MSBuild generates the real header into the build
output directory. The previous code skipped the copy entirely on 3.13
("if 3.13 not in ..."), so the produced tarballs had Python.h but no
pyconfig.h next to it -- every C extension build against the onedir
failed with "fatal error C1083: Cannot open include file: 'pyconfig.h'".
Replace the version-string check with a layout-driven copy that mirrors
CPython's PC/layout/main.py: when PC/pyconfig.h.in exists, take the
generated header from the PCbuild output directory; otherwise take the
checked-in PC/pyconfig.h. Raise if neither is found, so a future
regression cannot silently ship broken tarballs.
Add unit tests for both branches plus the missing-file error paths.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Python <= 3.12 ships PC/pyconfig.h. Python 3.13+ replaced that file with PC/pyconfig.h.in and MSBuild generates the real header into the build output directory. The previous code skipped the copy entirely on 3.13 ("if 3.13 not in ..."), so the produced tarballs had Python.h but no pyconfig.h next to it -- every C extension build against the onedir failed with "fatal error C1083: Cannot open include file: 'pyconfig.h'".
Replace the version-string check with a layout-driven copy that mirrors CPython's PC/layout/main.py: when PC/pyconfig.h.in exists, take the generated header from the PCbuild output directory; otherwise take the checked-in PC/pyconfig.h. Raise if neither is found, so a future regression cannot silently ship broken tarballs.
Add unit tests for both branches plus the missing-file error paths.