Use BuildDetails for the native build case as well

Signed-off-by: Michał Górny <mgorny@quansight.com>

Author: mgorny

mesonpy/__init__.py

@@ -340,7 +340,7 @@ class _WheelBuilder():
     _manifest: Dict[str, List[_Entry]]
     _limited_api: bool
     _allow_windows_shared_libs: bool
-    _build_details: mesonpy._tags.BuildDetails | None
+    _build_details: mesonpy._tags.BuildDetails
 
     @property
     def _has_internal_libs(self) -> bool:
@@ -835,7 +835,7 @@ def __init__(
         ''')
         self._meson_native_file.write_text(native_file_data, encoding='utf-8')
 
-        # Starting with version 1.10, Meson can consume a `build-detail.json`
+        # Starting with version 1.10, Meson can consume a `build-details.json`
         # file following the specification is PEP 739 to obtain required
         # information to build extension modules without having to run the
         # interpreter. The path to the `build-details.json` can be specified
@@ -852,6 +852,8 @@ def __init__(
                 with open(value, 'r', encoding='utf8') as f:
                     self._build_details = json.load(f)
                 break
+        if self._build_details is None:
+            self._build_details = mesonpy._tags.get_build_details_for_system()
 
         # reconfigure if we have a valid Meson build directory. Meson
         # uses the presence of the 'meson-private/coredata.dat' file
@@ -1344,7 +1346,8 @@ def build_editable(
     if not config_settings:
         config_settings = {}
     if 'build-dir' not in config_settings and 'builddir' not in config_settings:
-        config_settings['build-dir'] = 'build/' + mesonpy._tags.get_abi_tag()
+        # TODO: account for build-details.json for the abi tag?
+        config_settings['build-dir'] = 'build/' + mesonpy._tags.get_abi_tag(mesonpy._tags.get_build_details_for_system())
 
     out = pathlib.Path(wheel_directory)
     with _project(config_settings) as project:

mesonpy/_tags.py

@@ -45,31 +45,99 @@ class BuildDetails(TypedDict):
 _32_BIT_INTERPRETER = struct.calcsize('P') == 4
 
 
-def get_interpreter_tag(build_details: BuildDetails | None = None) -> str:
-    if build_details is None:
-        name = sys.implementation.name
-        major, minor = sys.version_info[:2]
-    else:
-        name = build_details['implementation']['name']
-        _v = build_details['implementation']['version']
-        major = _v['major']
-        minor = _v['minor']
+def _get_macosx_platform() -> str:
+    ver, _, arch = platform.mac_ver()
+    major, minor = map(int, ver.split('.')[:2])
+
+    # Python built with older macOS SDK on macOS 11, reports an
+    # nonexistent macOS 10.16 version instead of the real version.
+    #
+    # The packaging module introduced a workaround
+    # https://github.com/pypa/packaging/commit/67c4a2820c549070bbfc4bfbf5e2a250075048da
+    #
+    # This results in packaging versions up to 21.3 generating
+    # platform tags like "macosx_10_16_x86_64" and later versions
+    # generating "macosx_11_0_x86_64".  Using the latter would be more
+    # correct but prevents the resulting wheel from being installed on
+    # systems using packaging 21.3 or earlier (pip 22.3 or earlier).
+    #
+    # Fortunately packaging versions carrying the workaround still
+    # accepts "macosx_10_16_x86_64" as a compatible platform tag.  We
+    # can therefore ignore the issue and generate the slightly
+    # incorrect tag.
+
+    if _32_BIT_INTERPRETER:
+        # 32-bit Python running on a 64-bit kernel.
+        if arch == 'ppc64':
+            arch = 'ppc'
+        if arch == 'x86_64':
+            arch = 'i386'
+
+    return f'macosx-{major}.{minor}-{arch}'
+
+
+def _get_ios_platform() -> str:
+    ver = platform.ios_ver().release
+    major, minor = map(int, ver.split('.')[:2])
+
+    # Although _multiarch is an internal implementation detail, it's a core part
+    # of how CPython is implemented on iOS; this attribute is also relied upon
+    # by `packaging` as part of tag determination.
+    multiarch = sys.implementation._multiarch.replace('-', '_')
+
+    return f'ios-{major}.{minor}-{multiarch}'
+
+
+def get_build_details_for_system() -> BuildDetails:
+    platform = sysconfig.get_platform()
+    if platform.startswith('macosx'):
+        platform = _get_macosx_platform()
+    elif platform.startswith('ios'):
+        platform = _get_ios_platform()
+    elif _32_BIT_INTERPRETER:
+        # 32-bit Python running on a 64-bit kernel.
+        if platform == 'linux-x86_64':
+            platform = 'linux_i686'
+        if platform == 'linux-aarch64':
+            platform = 'linux_armv7l'
+
+    return {
+        'abi': {
+            # PyPy reports a $SOABI that does not agree with $EXT_SUFFIX.
+            # Using $EXT_SUFFIX will not break when PyPy will fix this.
+            # See https://foss.heptapod.net/pypy/pypy/-/issues/3816 and
+            # https://github.com/pypa/packaging/pull/607.
+            'extension_suffix': str(sysconfig.get_config_var('EXT_SUFFIX')),
+        },
+        'implementation': {
+            'name': sys.implementation.name,
+            'version': {
+                'major': sys.version_info.major,
+                'minor': sys.version_info.minor,
+            },
+        },
+        'platform': platform,
+    }
+
+
+def get_interpreter_tag(build_details: BuildDetails) -> str:
+    name = build_details['implementation']['name']
+    _v = build_details['implementation']['version']
+    major = _v['major']
+    minor = _v['minor']
     name = INTERPRETERS.get(name, name)
     return f'{name}{major}{minor}'
 
 
-def get_abi_tag(build_details: BuildDetails | None = None) -> str:
+def get_abi_tag(build_details: BuildDetails) -> str:
     # The best solution to obtain the Python ABI is to parse the
     # $SOABI or $EXT_SUFFIX sysconfig variables as defined in PEP-314.
 
     # PyPy reports a $SOABI that does not agree with $EXT_SUFFIX.
     # Using $EXT_SUFFIX will not break when PyPy will fix this.
     # See https://foss.heptapod.net/pypy/pypy/-/issues/3816 and
     # https://github.com/pypa/packaging/pull/607.
-    if build_details is None:
-        ext_suffix = str(sysconfig.get_config_var('EXT_SUFFIX'))
-    else:
-        ext_suffix = build_details['abi']['extension_suffix']
+    ext_suffix = build_details['abi']['extension_suffix']
     empty, abi, ext = ext_suffix.split('.')
 
     # The packaging module initially based his understanding of the
@@ -91,8 +159,8 @@ def get_abi_tag(build_details: BuildDetails | None = None) -> str:
     return abi.replace('.', '_').replace('-', '_')
 
 
-def _get_macosx_platform_tag(build_details: BuildDetails | None = None) -> str:
-    ver, _, arch = platform.mac_ver()
+def _get_macosx_platform_tag(platform: str) -> str:
+    platform_os, version, arch = platform.split('-', 2)
 
     # Override the architecture with the one provided in the
     # _PYTHON_HOST_PLATFORM environment variable.  This environment
@@ -112,24 +180,7 @@ def _get_macosx_platform_tag(build_details: BuildDetails | None = None) -> str:
         parts = os.environ.get('MACOSX_DEPLOYMENT_TARGET', '').split('.')[:2]
         version = tuple(map(int, parts + ['0'] * (2 - len(parts))))
     except ValueError:
-        version = tuple(map(int, ver.split('.')))[:2]
-
-    # Python built with older macOS SDK on macOS 11, reports an
-    # nonexistent macOS 10.16 version instead of the real version.
-    #
-    # The packaging module introduced a workaround
-    # https://github.com/pypa/packaging/commit/67c4a2820c549070bbfc4bfbf5e2a250075048da
-    #
-    # This results in packaging versions up to 21.3 generating
-    # platform tags like "macosx_10_16_x86_64" and later versions
-    # generating "macosx_11_0_x86_64".  Using the latter would be more
-    # correct but prevents the resulting wheel from being installed on
-    # systems using packaging 21.3 or earlier (pip 22.3 or earlier).
-    #
-    # Fortunately packaging versions carrying the workaround still
-    # accepts "macosx_10_16_x86_64" as a compatible platform tag.  We
-    # can therefore ignore the issue and generate the slightly
-    # incorrect tag.
+        version = tuple(map(int, version.split('.')[:2]))
 
     # The minimum macOS ABI version on arm64 is 11.0.  The macOS SDK
     # on arm64 silently bumps any compatibility version specified via
@@ -151,59 +202,36 @@ def _get_macosx_platform_tag(build_details: BuildDetails | None = None) -> str:
         # the patch level.  Reset the patch level to zero.
         minor = 0
 
-    # When using build-details.json, the platform recorded should be correct
-    # per the bitness of the interpreter.
-    if build_details is None and _32_BIT_INTERPRETER:
-        # 32-bit Python running on a 64-bit kernel.
-        if arch == 'ppc64':
-            arch = 'ppc'
-        if arch == 'x86_64':
-            arch = 'i386'
+    return f'{platform_os}_{major}_{minor}_{arch}'
 
-    return f'macosx_{major}_{minor}_{arch}'
 
+def _get_ios_platform_tag(platform: str) -> str:
+    platform_os, version, multiarch = platform.split('-', 2)
 
-def _get_ios_platform_tag() -> str:
     # Override the iOS version if one is provided via the
     # IPHONEOS_DEPLOYMENT_TARGET environment variable.
     try:
         parts = os.environ.get('IPHONEOS_DEPLOYMENT_TARGET', '').split('.')[:2]
-        version = tuple(map(int, parts + ['0'] * (2 - len(parts))))
+        version = '.'.join(map(int, parts + ['0'] * (2 - len(parts))))
     except ValueError:
-        version = tuple(map(int, platform.ios_ver().release.split('.')))[:2]  # type: ignore[attr-defined]
-
-    # Although _multiarch is an internal implementation detail, it's a core part
-    # of how CPython is implemented on iOS; this attribute is also relied upon
-    # by `packaging` as part of tag determination.
-    multiarch = sys.implementation._multiarch.replace('-', '_')
+        pass
 
-    return f'ios_{version[0]}_{version[1]}_{multiarch}'
+    return f'{platform_os}_{version.replace('.', '_')}_{multiarch.replace('-', '_')}'
 
 
 def get_platform_tag(build_details: BuildDetails | None = None) -> str:
-    if build_details is None:
-        platform = sysconfig.get_platform()
-    else:
-        platform = build_details['platform']
-
+    platform = build_details['platform']
     if platform.startswith('macosx'):
-        return _get_macosx_platform_tag(build_details)
+        return _get_macosx_platform_tag(platform)
     if platform.startswith('ios'):
-        return _get_ios_platform_tag()
-    # When using build-details.json, the platform recorded should be correct
-    # per the bitness of the interpreter.
-    if build_details is None and _32_BIT_INTERPRETER:
-        # 32-bit Python running on a 64-bit kernel.
-        if platform == 'linux-x86_64':
-            return 'linux_i686'
-        if platform == 'linux-aarch64':
-            return 'linux_armv7l'
+        return _get_ios_platform_tag(platform)
     return platform.replace('-', '_').replace('.', '_').lower()
 
 
 class Tag:
     def __init__(self, interpreter: str | None = None, abi: str | None = None, platform: str | None = None,
                  build_details: BuildDetails | None = None):
+        assert (interpreter is not None and abi is not None and platform is not None) or build_details is not None
         self.interpreter = interpreter or get_interpreter_tag(build_details)
         self.abi = abi or get_abi_tag(build_details)
         self.platform = platform or get_platform_tag(build_details)

tests/test_tags.py

@@ -55,11 +55,12 @@ def get_abi3_suffix():
 
 SUFFIX = sysconfig.get_config_var('EXT_SUFFIX')
 ABI3SUFFIX = get_abi3_suffix()
+SYSTEM_BUILD_DETAILS = mesonpy._tags.get_build_details_for_system()
 
 
 def test_wheel_tag():
-    assert str(mesonpy._tags.Tag()) == f'{INTERPRETER}-{ABI}-{PLATFORM}'
-    assert str(mesonpy._tags.Tag(abi='abi3')) == f'{INTERPRETER}-abi3-{PLATFORM}'
+    assert str(mesonpy._tags.Tag(build_details=SYSTEM_BUILD_DETAILS)) == f'{INTERPRETER}-{ABI}-{PLATFORM}'
+    assert str(mesonpy._tags.Tag(abi='abi3', build_details=SYSTEM_BUILD_DETAILS)) == f'{INTERPRETER}-abi3-{PLATFORM}'
 
 
 @pytest.mark.skipif(sys.platform != 'darwin', reason='macOS specific test')
@@ -120,7 +121,7 @@ def wheel_builder_test_factory(content, pure=True, limited_api=False):
     manifest = defaultdict(list)
     for key, value in content.items():
         manifest[key] = [mesonpy._Entry(pathlib.Path(x), os.path.join('build', x)) for x in value]
-    return mesonpy._WheelBuilder(None, manifest, limited_api, False, None)
+    return mesonpy._WheelBuilder(None, manifest, limited_api, False, SYSTEM_BUILD_DETAILS)
 
 
 def test_tag_empty_wheel():
@@ -171,4 +172,4 @@ def test_build_details():
             build_details = json.load(f)
     except FileNotFoundError:
         return pytest.skip('build-details.json not found')
-    assert str(mesonpy._tags.Tag()) == str(mesonpy._tags.Tag(build_details=build_details))
+    assert str(mesonpy._tags.Tag(build_details=SYSTEM_BUILD_DETAILS)) == str(mesonpy._tags.Tag(build_details=build_details))