greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gh-134632: Fix build-details.json to use INCLUDEPY path (#134633)

Browse Source 
* 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
This commit is contained in:
Michał Górny
2025-06-17 10:05:04 +02:00
committed by GitHub
parent c51f241c97
commit 0d582def34
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/test/test_build_details.py
View File

@@ -123,6 +123,13 @@ class CPythonBuildDetailsTests(unittest.TestCase, FormatTestsBase):
self.assertEqual(os.path.realpath(value), os.path.realpath(sys.executable)) self.assertEqual(os.path.realpath(value), os.path.realpath(sys.executable))
@needs_installed_python
def test_c_api(self):
value = self.key('c_api')
self.assertTrue(os.path.exists(os.path.join(value['headers'], 'Python.h')))
version = sysconfig.get_config_var('VERSION')
self.assertTrue(os.path.exists(os.path.join(value['pkgconfig_path'], f'python-{version}.pc')))
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

3
Misc/NEWS.d/next/Build/2025-05-24-16-59-20.gh-issue-134632.i0W2hc.rst Normal file
View File

@@ -0,0 +1,3 @@
Fixed ``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.

4
Tools/build/generate-build-details.py
View File

@@ -75,7 +75,7 @@ def generate_data(schema_version: str) -> collections.defaultdict[str, Any]:
PY3LIBRARY = sysconfig.get_config_var('PY3LIBRARY') PY3LIBRARY = sysconfig.get_config_var('PY3LIBRARY')
LIBPYTHON = sysconfig.get_config_var('LIBPYTHON') LIBPYTHON = sysconfig.get_config_var('LIBPYTHON')
LIBPC = sysconfig.get_config_var('LIBPC') LIBPC = sysconfig.get_config_var('LIBPC')
INCLUDEDIR = sysconfig.get_config_var('INCLUDEDIR') INCLUDEPY = sysconfig.get_config_var('INCLUDEPY')
if os.name == 'posix': if os.name == 'posix':
# On POSIX, LIBRARY is always the static library, while LDLIBRARY is the # On POSIX, LIBRARY is always the static library, while LDLIBRARY is the
@@ -123,7 +123,7 @@ def generate_data(schema_version: str) -> collections.defaultdict[str, Any]:
if has_static_library: if has_static_library:
data['libpython']['static'] = os.path.join(LIBDIR, LIBRARY) data['libpython']['static'] = os.path.join(LIBDIR, LIBRARY)
data['c_api']['headers'] = INCLUDEDIR data['c_api']['headers'] = INCLUDEPY
if LIBPC: if LIBPC:
data['c_api']['pkgconfig_path'] = LIBPC data['c_api']['pkgconfig_path'] = LIBPC