Skip to content

Commit 1cb9bcc

Browse files
committed
hatch
1 parent 2ef2e13 commit 1cb9bcc

2 files changed

Lines changed: 16 additions & 8 deletions

File tree

pywry/hatch_build.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ def get_wheel_platform_tag() -> str:
7272
return "macosx_13_0_x86_64"
7373
if system == "linux":
7474
if machine == "aarch64":
75-
return "manylinux_2_35_aarch64"
76-
return "manylinux_2_35_x86_64"
75+
return "manylinux_2_28_aarch64"
76+
return "manylinux_2_28_x86_64"
7777
if system == "windows":
7878
if machine in ("arm64", "aarch64"):
7979
return "win_arm64"
@@ -141,8 +141,13 @@ def initialize(self, version: str, build_data: dict[str, Any]) -> None:
141141
pytauri_version = "0.8.0"
142142

143143
# Map our wheel platform tag to pytauri-wheel's platform tag
144-
# pytauri-wheel uses manylinux_2_35, we use manylinux_2_35 too
144+
# pytauri-wheel publishes manylinux_2_35 wheels, but we tag our wheel as manylinux_2_28
145+
# for broader compatibility (2_35 binaries work on 2_28+ systems)
145146
download_platform = wheel_platform_tag
147+
if "manylinux_2_28" in wheel_platform_tag:
148+
download_platform = wheel_platform_tag.replace(
149+
"manylinux_2_28", "manylinux_2_35"
150+
)
146151

147152
self.app.display_info(
148153
f"Downloading pytauri-wheel {pytauri_version} for {download_platform}"

pywry/pyproject.toml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,16 @@ test-command = "python -c \"import pywry; print(f'pywry {pywry.__version__} load
114114
dependency-versions = "latest"
115115

116116
[tool.cibuildwheel.linux]
117-
before-all = "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && apt-get update && apt-get install -y libwebkit2gtk-4.1-dev libgtk-3-dev || true"
117+
before-all = "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && dnf install -y webkit2gtk4.1-devel gtk3-devel || yum install -y webkit2gtk4.1-devel gtk3-devel || true"
118118
environment = { PATH = "$HOME/.cargo/bin:$PATH" }
119-
manylinux-x86_64-image = "quay.io/pypa/manylinux_2_35_x86_64"
120-
manylinux-aarch64-image = "quay.io/pypa/manylinux_2_35_aarch64"
119+
manylinux-x86_64-image = "manylinux_2_28"
120+
manylinux-aarch64-image = "manylinux_2_28"
121+
repair-wheel-command = ""
121122

122123
[tool.cibuildwheel.macos]
123-
# No cross-compilation - each runner builds for its native architecture
124+
# Disable delocate repair - we bundle pre-built pytauri-wheel binaries
125+
repair-wheel-command = ""
124126

125127
[tool.cibuildwheel.windows]
126-
# No cross-compilation - each runner builds for its native architecture
128+
# No repair needed on Windows
129+
repair-wheel-command = ""

0 commit comments

Comments
 (0)