FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.15] gh-122931: Allow stable abi3 API extensions to include a multiarch tuple in the filename (GH-152461) by miss-islington · Pull Request #154772 · python/cpython · GitHub

Repository navigation

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .ac  (1) .c  (1) .in  (1) .py  (3) .rst  (2) No extension  (1) All 6 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
8 changes: 8 additions & 0 deletions Doc/whatsnew/3.15.rst
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
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,14 @@ Other language changes
imports ``pkg.sub.mod``.
(Contributed by Gregory P. Smith in :gh:`83065`.)

* File names of Stable ABI extensions that use the ``.so`` suffix may now
include a multiarch tuple, for example, ``foo.abi3-x86-64-linux-gnu.so``.
This permits stable ABI extensions for multiple architectures to be
co-installed into the same directory, without clashing with each
other, as regular dynamic extensions do.
(Contributed by Stefano Rivera in :gh:`122931`.)



Default interactive shell
=========================
Expand Down
9 changes: 9 additions & 0 deletions Lib/test/pythoninfo.py
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
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,7 @@ def collect_sysconfig(info_add):

for name in (
'ABIFLAGS',
'ALT_SOABI',
'ANDROID_API_LEVEL',
'CC',
'CCSHARED',
Expand All @@ -595,6 +596,7 @@ def collect_sysconfig(info_add):
'Py_REMOTE_DEBUG',
'SHELL',
'SOABI',
'SOABI_PLATFORM',
'TEST_MODULES',
'VAPTH',
'abs_builddir',
Expand Down Expand Up @@ -1316,6 +1318,12 @@ def collect_system(info_add):
info_add('system.hardware', hardware)


def collect_importlib(info_add):
import importlib.machinery
info_add('importlib.extension_suffixes',
importlib.machinery.EXTENSION_SUFFIXES)


def collect_info(info):
error = False
info_add = info.add
Expand Down Expand Up @@ -1358,6 +1366,7 @@ def collect_info(info):
collect_zstd,
collect_libregrtest_utils,
collect_system,
collect_importlib,

# Collecting from tests should be last as they have side effects.
collect_test_socket,
Expand Down
9 changes: 9 additions & 0 deletions Lib/test/test_importlib/extension/test_finder.py
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import unittest
import sys
import sysconfig


class FinderTests(abc.FinderTests):
Expand Down Expand Up @@ -61,6 +62,7 @@ def test_failure(self):

def test_abi3_extension_suffixes(self):
suffixes = self.machinery.EXTENSION_SUFFIXES
platform = sysconfig.get_config_var("SOABI_PLATFORM")
if 'win32' in sys.platform:
# Either "_d.pyd" or ".pyd" must be in suffixes
self.assertTrue({"_d.pyd", ".pyd"}.intersection(suffixes))
Expand All @@ -73,6 +75,13 @@ def test_abi3_extension_suffixes(self):
self.assertIn(".abi3.so", suffixes)
self.assertIn(".abi3t.so", suffixes)

if platform:
if Py_GIL_DISABLED:
self.assertNotIn(f".abi3-{platform}.so", suffixes)
else:
self.assertIn(f".abi3-{platform}.so", suffixes)
self.assertIn(f".abi3t-{platform}.so", suffixes)


(Frozen_FinderTests,
Source_FinderTests
Expand Down
9 changes: 9 additions & 0 deletions Lib/test/test_sysconfig.py
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
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,15 @@ def test_soabi(self):
soabi = sysconfig.get_config_var('SOABI')
self.assertIn(soabi, _imp.extension_suffixes()[0])

@unittest.skipIf(not _imp.extension_suffixes(), "stub loader has no suffixes")
@unittest.skipIf(sys.platform == "win32", "Does not apply to Windows")
@unittest.skipIf(sysconfig.get_config_var('SOABI_PLATFORM') == 0,
"SOABI_PLATFORM is undefined")
def test_soabi_platform(self):
soabi_platform = sysconfig.get_config_var('SOABI_PLATFORM')
soabi = sysconfig.get_config_var('SOABI')
self.assertIn(soabi_platform, soabi)

def test_library(self):
library = sysconfig.get_config_var('LIBRARY')
ldlibrary = sysconfig.get_config_var('LDLIBRARY')
Expand Down
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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow importing stable ABI C extensions that include a multiarch tuple in their filename, e.g. ``foo.abi3-x86-64-linux-gnu.so``.
6 changes: 6 additions & 0 deletions Python/dynload_shlib.c
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
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,14 @@ const char *_PyImport_DynLoadFiletab[] = {
"." ALT_SOABI ".so",
#endif
#ifndef Py_GIL_DISABLED
#ifdef SOABI_PLATFORM
".abi" PYTHON_ABI_STRING "-" SOABI_PLATFORM ".so",
#endif /* SOABI_PLATFORM */
".abi" PYTHON_ABI_STRING ".so",
#endif /* Py_GIL_DISABLED */
#ifdef SOABI_PLATFORM
".abi" PYTHON_ABI_STRING "t-" SOABI_PLATFORM ".so",
#endif /* SOABI_PLATFORM */
".abi" PYTHON_ABI_STRING "t.so",
".so",
#endif /* __CYGWIN__ */
Expand Down
6 changes: 6 additions & 0 deletions configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions configure.ac
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
Original file line number Diff line number Diff line change
Expand Up @@ -1212,6 +1212,10 @@ AS_CASE([$ac_sys_system],
[SOABI_PLATFORM=$PLATFORM_TRIPLET]
)

if test x$SOABI_PLATFORM != x; then
AC_DEFINE_UNQUOTED([SOABI_PLATFORM], ["${SOABI_PLATFORM}"], [Platform tag, used in binary module extension filenames.])
fi

if test x$MULTIARCH != x; then
MULTIARCH_CPPFLAGS="-DMULTIARCH=\\\"$MULTIARCH\\\""
fi
Expand Down
3 changes: 3 additions & 0 deletions pyconfig.h.in
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
Original file line number Diff line number Diff line change
Expand Up @@ -1872,6 +1872,9 @@
/* The size of '_Bool', as computed by sizeof. */
#undef SIZEOF__BOOL

/* Platform tag, used in binary module extension filenames. */
#undef SOABI_PLATFORM

/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS

Expand Down
Loading

Back | FazBrowse Home | New Git URL