Support specifying variants for wheel builds

demo-plugins/demo_plugins.py

@@ -0,0 +1,29 @@
+from variantlib.base import PluginBase
+from variantlib.config import ProviderConfig
+from variantlib.meta import VariantDescription
+
+
+class BlasPlugin(PluginBase):
+    namespace = "blas"
+
+    def get_supported_configs(self) -> ProviderConfig:
+        return None
+
+    def get_variant_labels(self, variant_desc: VariantDescription) -> list[str]:
+        for meta in variant_desc:
+            if meta.namespace == "blas" and meta.key == "variant":
+                return [meta.value]
+        return []
+
+
+class X8664Plugin(PluginBase):
+    namespace = "x86_64"
+
+    def get_supported_configs(self) -> ProviderConfig:
+        return None
+
+    def get_variant_labels(self, variant_desc: VariantDescription) -> list[str]:
+        for meta in variant_desc:
+            if meta.namespace == "x86_64" and meta.key == "baseline":
+                return [f"x86_64_{meta.value}"]
+        return []

demo-plugins/pyproject.toml

@@ -0,0 +1,13 @@
+[build-system]
+requires = ["flit_core>=3.2,<4"]
+build-backend = "flit_core.buildapi"
+
+[project]
+name = "demo-plugins"
+version = "0"
+description = "Demo plugins for meson-python/numpy variants"
+dependencies = ["variantlib"]
+
+[project.entry-points."variantlib.plugins"]
+blas = "demo_plugins:BlasPlugin"
+x86_64 = "demo_plugins:X8664Plugin"

mesonpy/__init__.py

@@ -44,6 +44,9 @@
 import packaging.version
 import pyproject_metadata
 
+from variantlib.meta import VariantMeta, VariantDescription
+from variantlib.plugins import PluginLoader
+
 import mesonpy._compat
 import mesonpy._rpath
 import mesonpy._tags
@@ -310,11 +313,13 @@ def __init__(
         manifest: Dict[str, List[Tuple[pathlib.Path, str]]],
         limited_api: bool,
         allow_windows_shared_libs: bool,
+        variant: Optional[VariantDescriptor],
     ) -> None:
         self._metadata = metadata
         self._manifest = manifest
         self._limited_api = limited_api
         self._allow_windows_shared_libs = allow_windows_shared_libs
+        self._variant = variant
 
     @property
     def _has_internal_libs(self) -> bool:
@@ -351,7 +356,17 @@ def tag(self) -> mesonpy._tags.Tag:
     @property
     def name(self) -> str:
         """Wheel name, this includes the basename and tag."""
-        return f'{self._metadata.distribution_name}-{self._metadata.version}-{self.tag}'
+        name = f'{self._metadata.distribution_name}-{self._metadata.version}-{self.tag}'
+        if self._variant is not None:
+            name += f'-{self._variant.hexdigest}'
+            labels = PluginLoader().get_variant_labels(self._variant)
+            for numlabels in range(len(labels), 0, -1):
+                long_name = "+".join((name, *labels[:numlabels]))
+                # if labels would give us filename that's longer than 128
+                # characters (124 + .whl), strip them
+                if len(long_name) < 124:
+                    return long_name
+        return name
 
     @property
     def _distinfo_dir(self) -> str:
@@ -448,7 +463,20 @@ def _install_path(self, wheel_file: mesonpy._wheelfile.WheelFile, origin: Path,
 
     def _wheel_write_metadata(self, whl: mesonpy._wheelfile.WheelFile) -> None:
         # add metadata
-        whl.writestr(f'{self._distinfo_dir}/METADATA', bytes(self._metadata.as_rfc822()))
+        metadata = self._metadata.as_rfc822()
+
+        # inject variant metadata
+        if self._variant is not None:
+            # hack to avoid forking pyproject-metadata
+            import pyproject_metadata.constants as c
+            c.KNOWN_METADATA_FIELDS.add('variant')
+            c.KNOWN_METADATA_FIELDS.add('variant-hash')
+
+            metadata['Variant-Hash'] = self._variant.hexdigest
+            for meta in self._variant:
+                metadata['Variant'] = meta.to_str()
+
+        whl.writestr(f'{self._distinfo_dir}/METADATA', bytes(metadata))
         whl.writestr(f'{self._distinfo_dir}/WHEEL', self.wheel)
         if self.entrypoints_txt:
             whl.writestr(f'{self._distinfo_dir}/entry_points.txt', self.entrypoints_txt)
@@ -599,6 +627,11 @@ def _bool(value: Any, name: str) -> bool:
     def _string_or_strings(value: Any, name: str) -> List[str]:
         return list([value,] if isinstance(value, str) else value)
 
+    def _variant_names(value: Any, name: str) -> list[VariantMeta]:
+        if isinstance(value, str):
+            value = [value]
+        return [VariantMeta.from_str(x) for x in value]
+
     options = {
         'builddir': _string,
         'build-dir': _string,
@@ -607,6 +640,8 @@ def _string_or_strings(value: Any, name: str) -> List[str]:
         'setup-args': _string_or_strings,
         'compile-args': _string_or_strings,
         'install-args': _string_or_strings,
+        'variant': _variant_names,
+        'variant-name': _variant_names,
     }
     assert all(f'{name}-args' in options for name in _MESON_ARGS_KEYS)
 
@@ -644,10 +679,12 @@ def __init__(
         build_dir: Path,
         meson_args: Optional[MesonArgs] = None,
         editable_verbose: bool = False,
+        variant: Optional[VariantDescription] = None,
     ) -> None:
         self._source_dir = pathlib.Path(source_dir).absolute()
         self._build_dir = pathlib.Path(build_dir).absolute()
         self._editable_verbose = editable_verbose
+        self._variant = variant
         self._meson_native_file = self._build_dir / 'meson-python-native-file.ini'
         self._meson_cross_file = self._build_dir / 'meson-python-cross-file.ini'
         self._meson_args: MesonArgs = collections.defaultdict(list)
@@ -1001,13 +1038,13 @@ def sdist(self, directory: Path) -> pathlib.Path:
     def wheel(self, directory: Path) -> pathlib.Path:
         """Generates a wheel in the specified directory."""
         self.build()
-        builder = _WheelBuilder(self._metadata, self._manifest, self._limited_api, self._allow_windows_shared_libs)
+        builder = _WheelBuilder(self._metadata, self._manifest, self._limited_api, self._allow_windows_shared_libs, self._variant)
         return builder.build(directory)
 
     def editable(self, directory: Path) -> pathlib.Path:
         """Generates an editable wheel in the specified directory."""
         self.build()
-        builder = _EditableWheelBuilder(self._metadata, self._manifest, self._limited_api, self._allow_windows_shared_libs)
+        builder = _EditableWheelBuilder(self._metadata, self._manifest, self._limited_api, self._allow_windows_shared_libs, self._variant)
         return builder.build(directory, self._source_dir, self._build_dir, self._build_command, self._editable_verbose)
 
 
@@ -1020,11 +1057,18 @@ def _project(config_settings: Optional[Dict[Any, Any]] = None) -> Iterator[Proje
     source_dir = os.path.curdir
     build_dir = settings.get('build-dir')
     editable_verbose = bool(settings.get('editable-verbose'))
+    variants = settings.get('variant', [])
+    variant_names = settings.get('variant-name', []) + variants
+
+    variant_desc = VariantDescription(variant_names) if variant_names else None
+    if variants:
+        meson_args.setdefault('setup', [])
+        meson_args['setup'].append(f'-Dvariant={[x.to_str() for x in variants]!r}')
 
     with contextlib.ExitStack() as ctx:
         if build_dir is None:
             build_dir = ctx.enter_context(tempfile.TemporaryDirectory(prefix='.mesonpy-', dir=source_dir))
-        yield Project(source_dir, build_dir, meson_args, editable_verbose)
+        yield Project(source_dir, build_dir, meson_args, editable_verbose, variant_desc)
 
 
 def _parse_version_string(string: str) -> Tuple[int, ...]:

pyproject.toml

@@ -11,6 +11,7 @@ requires = [
   'packaging >= 19.0',
   'pyproject-metadata >= 0.9.0',
   'tomli >= 1.0.0; python_version < "3.11"',
+  'variantlib @ https://github.com/wheelnext/variantlib/archive/main.tar.gz',
 ]
 
 [project]
@@ -39,6 +40,7 @@ dependencies = [
   'packaging >= 19.0',
   'pyproject-metadata >= 0.9.0',
   'tomli >= 1.0.0; python_version < "3.11"',
+  'variantlib @ https://github.com/wheelnext/variantlib/archive/variant-json.tar.gz',
 ]
 
 [project.optional-dependencies]