Skip to content

Commit 55b5b74

Browse files
committed
Stop hardcoding manylinux glibc version in wheelbuilder
1 parent 8fde940 commit 55b5b74

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

graalpython/com.oracle.graal.python.test/src/tests/test_wheel.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
# SOFTWARE.
3939

4040
import os
41-
import platform
4241
import shlex
4342
import shutil
4443
import subprocess
@@ -51,7 +50,6 @@
5150

5251

5352
class TestWheelBuildAndRun(unittest.TestCase):
54-
@unittest.skipIf(sys.platform == 'linux' and platform.machine() == 'aarch64', "GR-68855")
5553
def test_build_install_and_run(self):
5654
# Build a C library and a wheel that depends on it. Then run it through repair_wheel to vendor the library in and verify that it can be imported
5755
orig_root = Path(__file__).parent.resolve()

scripts/wheelbuilder/repair_wheels.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ def ensure_installed(name, *extra):
5555
subprocess.check_call([sys.executable, "-m", "pip", "install", name, *extra])
5656
return importlib.import_module(name)
5757

58+
5859
def repair_wheels(wheelhouse):
5960
whls = glob("*.whl")
6061
env = os.environ.copy()
@@ -81,19 +82,10 @@ def repair_wheels(wheelhouse):
8182
)
8283
elif sys.platform == "linux":
8384
ensure_installed("auditwheel", "patchelf")
84-
arch = platform.machine().lower()
85-
if arch == "x86_64":
86-
plat_arg = "manylinux_2_28_x86_64"
87-
elif arch == "aarch64":
88-
plat_arg = "manylinux_2_28_aarch64"
89-
else:
90-
raise RuntimeError(f"Unsupported architecture on Linux: {arch}")
9185
p = subprocess.run(
9286
[
9387
join(dirname(sys.executable), "auditwheel"),
9488
"repair",
95-
"--plat",
96-
plat_arg,
9789
"-w",
9890
wheelhouse,
9991
whl,
@@ -132,6 +124,7 @@ def repair_wheels(wheelhouse):
132124
except Exception as e:
133125
print("Copy failed:", e, file=sys.stderr)
134126

127+
135128
if __name__ == "__main__":
136129
parser = argparse.ArgumentParser(description="Repair wheels using platform-specific tools.")
137130
parser.add_argument("--wheelhouse", required=True, help="Output directory for repaired wheels")

0 commit comments

Comments
 (0)