Revert "universal wheels"

This reverts commit 2f6befe.

Author: virtuald

devtools/subproject.py

@@ -1,11 +1,9 @@
-import os
 import pathlib
 import subprocess
 import shlex
 import shutil
 import sys
 import tempfile
-import textwrap
 import typing as T
 
 from packaging.requirements import Requirement
@@ -45,14 +43,9 @@ def is_meson_project(self) -> bool:
     # Tasks
     #
 
-    def _cmd(self, *args: str, cwd=None, env=None):
+    def _cmd(self, *args: str, cwd=None):
         print("+", shlex.join(args))
-        if env:
-            envc = os.environ.copy()
-            envc.update(env)
-            env = envc
-
-        subprocess.check_call(args, cwd=cwd, env=env)
+        subprocess.check_call(args, cwd=cwd)
 
     def _run_pip(self, *args: str, cwd=None):
         self._cmd(
@@ -126,8 +119,6 @@ def build_wheel(
         # TODO: eventually it would be nice to use build isolation
 
         with tempfile.TemporaryDirectory() as td:
-            tdp = pathlib.Path(td)
-
             # I wonder if we should use hatch build instead?
             self._cmd(
                 sys.executable,
@@ -140,39 +131,9 @@ def build_wheel(
                 cwd=self.path,
             )
 
-            # On macOS we need to build two wheels and merge them together to build
-            # a universal wheel. Fun?
-            # - Since this script is for CI, we assume that we are building on arm64
-            if sys.platform == "darwin" and self.is_meson_project():
-
-                self._cmd(
-                    sys.executable,
-                    "-m",
-                    "build",
-                    "--no-isolation",
-                    "--outdir",
-                    td,
-                    *config_args,
-                    cwd=self.path,
-                    env=dict(ARCHFLAGS="-arch x86_64", SEMIWRAP_SKIP_PYI="1"),
-                )
-
-                native_wheels = list(map(str, tdp.glob("*.whl")))
-
-                self._cmd(
-                    sys.executable,
-                    "-m",
-                    "delocate.cmd.delocate_merge",
-                    "-vv",
-                    *native_wheels,
-                )
-
-                twhl = (set(map(str, tdp.glob("*.whl"))) - set(native_wheels)).pop()
-                dst_whl = wheel_path / pathlib.Path(twhl).name
-            else:
-                twhl = list(tdp.glob("*.whl"))[0]
-                dst_whl = wheel_path / self._fix_wheel_name(twhl.name)
-
+            tdp = pathlib.Path(td)
+            twhl = list(tdp.glob("*.whl"))[0]
+            dst_whl = wheel_path / self._fix_wheel_name(twhl.name)
             shutil.move(twhl, dst_whl)
 
         if install:

rdev_requirements.txt

@@ -10,10 +10,8 @@ toposort
 validobj~=1.2
 wheel
 
-delocate; platform_system == 'Darwin'
-
-hatch-meson @ git+https://github.com/virtuald/hatch-meson@more-macos-cross-binaries
 semiwrap @ git+https://github.com/robotpy/robotpy-build@semiwrap
+hatch-meson
 hatch-robotpy @ git+https://github.com/robotpy/hatch-robotpy@main
 hatch-nativelib @ git+https://github.com/robotpy/hatch-nativelib@rm-macos-relink
 ninja