gh-134632: Fix build-details.json to use INCLUDEPY path
#134633
Merged
Conversation
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
Fix ``build-details.json`` generation to use ``INCLUDEPY``, in order to reference the ``pythonX.Y`` subdirectory of the include directory, as required in :pep:`739`, instead of the top-level include directory.
|
CC @FFY00 |
ZeroIntensity
added
build
emmatyping
approved these changes
May 26, 2025
AA-Turner
reviewed
May 26, 2025
|
Gentle ping. |
rgommers
approved these changes
Jun 4, 2025
There was a problem hiding this comment.
Thanks @mgorny. This seems clearly correct, and matches what the PEP says.
For completeness, I searched the most popular build backends for usage (not that there's potential backwards compat impact, because build-details.json is brand new, but just to illustrate what the useful variable is):
setuptools: usesINCLUDEPY, does not useINCLUDEDIRmeson/meson-python: usesINCLUDEPY, does not useINCLUDEDIRcmake/scikit-build-core: does not use either of the twomaturin: does not use either of the two
Can this please be merged and backported to 3.14-beta?
FFY00
approved these changes
Jun 17, 2025
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Jun 17, 2025
…thonGH-134633) * pythongh-134632: Fix `build-details.json` to use `INCLUDEPY` path Fix ``build-details.json`` generation to use ``INCLUDEPY``, in order to reference the ``pythonX.Y`` subdirectory of the include directory, as required in :pep:`739`, instead of the top-level include directory. * test_build_details: Add tests for the c_api section * test_build_details: Expect pkgconfig for CPython unconditionally (cherry picked from commit 0d582de) Co-authored-by: Michał Górny <[email protected]>
|
GH-135605 is a backport of this pull request to the 3.14 branch. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Jun 17, 2025
…thonGH-134633) * pythongh-134632: Fix `build-details.json` to use `INCLUDEPY` path Fix ``build-details.json`` generation to use ``INCLUDEPY``, in order to reference the ``pythonX.Y`` subdirectory of the include directory, as required in :pep:`739`, instead of the top-level include directory. * test_build_details: Add tests for the c_api section * test_build_details: Expect pkgconfig for CPython unconditionally (cherry picked from commit 0d582de) Co-authored-by: Michał Górny <[email protected]>
|
Sorry @mgorny and @FFY00, I had trouble completing the backport. |
FFY00
pushed a commit
that referenced
this pull request
Jun 17, 2025
…H-134633) (#135605) gh-134632: Fix `build-details.json` to use `INCLUDEPY` path (GH-134633) * gh-134632: Fix `build-details.json` to use `INCLUDEPY` path Fix ``build-details.json`` generation to use ``INCLUDEPY``, in order to reference the ``pythonX.Y`` subdirectory of the include directory, as required in :pep:`739`, instead of the top-level include directory. * test_build_details: Add tests for the c_api section * test_build_details: Expect pkgconfig for CPython unconditionally (cherry picked from commit 0d582de) Co-authored-by: Michał Górny <[email protected]>
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
lkollar
pushed a commit
to lkollar/cpython
that referenced
this pull request
Jun 19, 2025
…thon#134633) * pythongh-134632: Fix `build-details.json` to use `INCLUDEPY` path Fix ``build-details.json`` generation to use ``INCLUDEPY``, in order to reference the ``pythonX.Y`` subdirectory of the include directory, as required in :pep:`739`, instead of the top-level include directory. * test_build_details: Add tests for the c_api section * test_build_details: Expect pkgconfig for CPython unconditionally
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix
build-details.jsongeneration to useINCLUDEPY, in order to reference thepythonX.Ysubdirectory of the include directory, as required in PEP-0739, instead of the top-level include directory.build-details.json:c_api.headersdoes not include thepythonX.Ydirectory #134632