BUG: fix issues with wheel tags, and add more tests to cover tags

mesonpy/__init__.py

@@ -195,6 +195,20 @@ def distinfo_dir(self) -> str:
     def data_dir(self) -> str:
         return f'{self.basename}.data'
 
+    @cached_property
+    def is_pure(self) -> bool:
+        """Is the wheel "pure" (architecture independent)?"""
+        # XXX: I imagine some users might want to force the package to be
+        # non-pure, but I think it's better that we evaluate use-cases as they
+        # arise and make sure allowing the user to override this is indeed the
+        # best option for the use-case.
+        if self._wheel_files['platlib']:
+            return False
+        for _, file in self._wheel_files['scripts']:
+            if self._is_native(file):
+                return False
+        return True
+
     @property
     def wheel(self) -> bytes:  # noqa: F811
         """Return WHEEL file for dist-info."""
@@ -204,7 +218,7 @@ def wheel(self) -> bytes:  # noqa: F811
             Root-Is-Purelib: {is_purelib}
             Tag: {tags}
         ''').strip().format(
-            is_purelib='true' if self._project.is_pure else 'false',
+            is_purelib='true' if self.is_pure else 'false',
             tags=f'{self.python_tag}-{self.abi_tag}-{self.platform_tag}',
         ).encode()
 
@@ -237,7 +251,7 @@ def abi_tag(self) -> str:
 
     @property
     def platform_tag(self) -> str:
-        if self._project.is_pure:
+        if self.is_pure:
             return 'any'
         # XXX: Choose the sysconfig platform here and let something like auditwheel
         #      fix it later if there are system dependencies (eg. replace it with a manylinux tag)
@@ -316,15 +330,12 @@ def _file_list_repr(self, files: Collection[str], prefix: str = '\t\t', max_coun
     def _files_by_tag(self) -> Mapping[mesonpy._tags.Tag, Collection[str]]:
         """Map files into ABI tags."""
         files_by_tag: Dict[mesonpy._tags.Tag, List[str]] = collections.defaultdict(list)
-        platlib_files = {destination for destination, _ in self._wheel_files['platlib']}
 
-        for file, details in self._sources.get('targets', {}).items():
-            destination = pathlib.Path(details['destination'])
+        for _, file in self._wheel_files['platlib']:
             # if in platlib, calculate the ABI tag
-            if destination in platlib_files:
-                tag = self._calculate_file_abi_tag_heuristic(file)
-                if tag:
-                    files_by_tag[tag].append(file)
+            tag = self._calculate_file_abi_tag_heuristic(file)
+            if tag:
+                files_by_tag[tag].append(file)
 
         return files_by_tag
 
@@ -364,10 +375,28 @@ def _select_abi_tag(self) -> Optional[mesonpy._tags.Tag]:  # noqa: C901
                     )
         return selected_tag
 
-    def _is_elf(self, file: Union[str, pathlib.Path]) -> bool:
-        """Check if file is an ELF file."""
+    def _is_native(self, file: Union[str, pathlib.Path]) -> bool:
+        """Check if file is a native file."""
+        self._project.build()  # the project needs to be built for this :/
+
         with open(file, 'rb') as f:
-            return f.read(4) == b'\x7fELF'
+            if platform.system() == 'Linux':
+                return f.read(4) == b'\x7fELF'  # ELF
+            elif platform.system() == 'Darwin':
+                return f.read(4) in (
+                    b'\xfe\xed\xfa\xce',  # 32-bit
+                    b'\xfe\xed\xfa\xcf',  # 64-bit
+                    b'\xcf\xfa\xed\xfe',  # arm64
+                    b'\xca\xfe\xba\xbe',  # universal / fat (same as java class so beware!)
+                )
+            elif platform.system() == 'Windows':
+                return f.read(2) == b'MZ'
+
+        # For unknown platforms, check for file extensions.
+        _, ext = os.path.splitext(file)
+        if ext in ('.so', '.a', '.out', '.exe', '.dll', '.dylib', '.pyd'):
+            return True
+        return False
 
     def _warn_unsure_platlib(self, origin: pathlib.Path, destination: pathlib.Path) -> None:
         """Warn if we are unsure if the file should be mapped to purelib or platlib.
@@ -381,7 +410,7 @@ def _warn_unsure_platlib(self, origin: pathlib.Path, destination: pathlib.Path)
         """
         # {moduledir_shared} is currently handled in heuristics due to a Meson bug,
         # but we know that files that go there are supposed to go to platlib.
-        if self._is_elf(origin):
+        if self._is_native(origin):
             # The file is architecture dependent and does not belong in puredir,
             # so the warning is skipped.
             return
@@ -491,7 +520,7 @@ def _install_file(
         # fix file
         if platform.system() == 'Linux':
             # add .mesonpy.libs to the RPATH of ELF files
-            if self._is_elf(os.fspath(origin)):
+            if self._is_native(os.fspath(origin)):
                 # copy ELF to our working directory to avoid Meson having to regenerate the file
                 new_origin = self._libs_build_dir / pathlib.Path(origin).relative_to(self._build_dir)
                 os.makedirs(new_origin.parent, exist_ok=True)
@@ -529,7 +558,7 @@ def build(self, directory: Path) -> pathlib.Path:
                 len(list(itertools.chain.from_iterable(self._wheel_files.values()))),
             ) as counter:
                 # install root scheme files
-                root_scheme = 'purelib' if self._project.is_pure else 'platlib'
+                root_scheme = 'purelib' if self.is_pure else 'platlib'
                 for destination, origin in self._wheel_files[root_scheme]:
                     self._install_file(whl, counter, origin, destination)
 
@@ -683,6 +712,17 @@ def _validate_metadata(self) -> None:
                     f'expected `{self._metadata.requires_python}`'
                 )
 
+    @cached_property
+    def _wheel_builder(self) -> _WheelBuilder:
+        return _WheelBuilder(
+            self,
+            self._source_dir,
+            self._install_dir,
+            self._build_dir,
+            self._install_plan,
+            self._copy_files,
+        )
+
     @functools.lru_cache(maxsize=None)
     def build(self) -> None:
         """Trigger the Meson build."""
@@ -796,18 +836,7 @@ def license_file(self) -> Optional[pathlib.Path]:
     @property
     def is_pure(self) -> bool:
         """Is the wheel "pure" (architecture independent)?"""
-        # XXX: I imagine some users might want to force the package to be
-        # non-pure, but I think it's better that we evaluate use-cases as they
-        # arise and make sure allowing the user to override this is indeed the
-        # best option for the use-case.
-        not_pure = ('{bindir}', '{libdir_shared}', '{libdir_static}', '{py_platlib}', '{moduledir_shared}')
-        for data_type, files in self._install_plan.items():
-            for entry in files.values():
-                if entry['destination'] is None:  # pragma: no cover
-                    continue
-                if any(key in entry['destination'] for key in not_pure):
-                    return False
-        return True
+        return bool(self._wheel_builder.is_pure)
 
     @property
     def pep621(self) -> bool:
@@ -867,14 +896,7 @@ def sdist(self, directory: Path) -> pathlib.Path:
 
     def wheel(self, directory: Path) -> pathlib.Path:  # noqa: F811
         """Generates a wheel (binary distribution) in the specified directory."""
-        wheel = _WheelBuilder(
-            self,
-            self._source_dir,
-            self._install_dir,
-            self._build_dir,
-            self._install_plan,
-            self._copy_files,
-        ).build(self._build_dir)
+        wheel = self._wheel_builder.build(self._build_dir)
 
         final_wheel = pathlib.Path(directory, wheel.name)
         shutil.move(os.fspath(wheel), final_wheel)

tests/packages/executable/example.c

@@ -0,0 +1,5 @@
+#include <stdio.h>
+
+int main() {
+	printf("hello!");
+}

tests/packages/executable/meson.build

@@ -0,0 +1,9 @@
+project(
+    'executable', 'c',
+    version: '1.0.0',
+)
+
+executable(
+    'example', 'example.c',
+    install: true,
+)

tests/packages/executable/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+build-backend = 'mesonpy'
+requires = ['meson-python']

tests/test_wheel.py

@@ -28,7 +28,7 @@
         if pymalloc or pymalloc is None:  # none is the default value, which is enable
             INTERPRETER_TAG += 'm'
 elif platform.python_implementation() == 'PyPy':
-    INTERPRETER_TAG = f'pypy3_{INTERPRETER_VERSION}'
+    INTERPRETER_TAG = sysconfig.get_config_var('SOABI').replace('-', '_')
     PYTHON_TAG = f'pp{INTERPRETER_VERSION}'
 else:
     raise NotImplementedError(f'Unknown implementation: {platform.python_implementation()}')
@@ -101,7 +101,7 @@ def test_configure_data(wheel_configure_data):
     artifact = wheel.wheelfile.WheelFile(wheel_configure_data)
 
     assert wheel_contents(artifact) == {
-        'configure_data-1.0.0.data/platlib/configure_data.py',
+        'configure_data.py',
         'configure_data-1.0.0.dist-info/METADATA',
         'configure_data-1.0.0.dist-info/RECORD',
         'configure_data-1.0.0.dist-info/WHEEL',
@@ -153,3 +153,19 @@ def test_executable_bit(wheel_executable_bit):
             assert executable_bit, f'{info.filename} should have the executable bit set!'
         else:
             assert not executable_bit, f'{info.filename} should not have the executable bit set!'
+
+
+@pytest.mark.skipif(os.name == 'nt',
+                    reason='Wheel build fixture in conftest.py broken on Windows')
+def test_detect_wheel_tag_module(wheel_purelib_and_platlib):
+    name = wheel.wheelfile.WheelFile(wheel_purelib_and_platlib).parsed_filename
+    assert name.group('pyver') == PYTHON_TAG
+    assert name.group('abi') == INTERPRETER_TAG
+    assert name.group('plat') == sysconfig.get_platform().replace('-', '_').replace('.', '_')
+
+
+def test_detect_wheel_tag_script(wheel_executable):
+    name = wheel.wheelfile.WheelFile(wheel_executable).parsed_filename
+    assert name.group('pyver') == 'py3'
+    assert name.group('abi') == 'none'
+    assert name.group('plat') == sysconfig.get_platform().replace('-', '_').replace('.', '_')