Skip to content

Commit 8ebd803

Browse files
kylebarronkylebarron
authored
Fix python wheel build (#860)
1 parent 43ee3c5 commit 8ebd803

File tree

2 files changed

+49
-47
lines changed

2 files changed

+49
-47
lines changed

‎.github/workflows/python-core-wheels.yml‎

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
uses: PyO3/maturin-action@v1
4848
with:
4949
target: ${{ matrix.platform.target }}
50-
args: --release --out dist --manifest-path python/${{ matrix.module }}/Cargo.toml
50+
args: --release --out dist --find-interpreter --manifest-path python/${{ matrix.module }}/Cargo.toml
5151
sccache: "true"
5252
manylinux: auto
5353
- name: Upload wheels
@@ -56,39 +56,40 @@ jobs:
5656
name: wheels-linux-${{ matrix.platform.target }}-${{ matrix.module }}
5757
path: dist
5858

59-
musllinux:
60-
runs-on: ${{ matrix.platform.runner }}
61-
strategy:
62-
matrix:
63-
platform:
64-
- runner: ubuntu-latest
65-
target: x86_64
66-
- runner: ubuntu-latest
67-
target: x86
68-
- runner: ubuntu-latest
69-
target: aarch64
70-
- runner: ubuntu-latest
71-
target: armv7
72-
module:
73-
- geoarrow-core
74-
- geoarrow-compute
75-
steps:
76-
- uses: actions/checkout@v4
77-
- uses: actions/setup-python@v5
78-
with:
79-
python-version: 3.x
80-
- name: Build wheels
81-
uses: PyO3/maturin-action@v1
82-
with:
83-
target: ${{ matrix.platform.target }}
84-
args: --release --out dist --manifest-path python/${{ matrix.module }}/Cargo.toml
85-
sccache: "true"
86-
manylinux: musllinux_1_2
87-
- name: Upload wheels
88-
uses: actions/upload-artifact@v4
89-
with:
90-
name: wheels-musllinux-${{ matrix.platform.target }}-${{ matrix.module }}
91-
path: dist
59+
# Commented out because rust 1.82 apparently isn't distributed yet (as of Nov 13, 2024) for musllinux? See https://github.com/geoarrow/geoarrow-rs/pull/860
60+
# musllinux:
61+
# runs-on: ${{ matrix.platform.runner }}
62+
# strategy:
63+
# matrix:
64+
# platform:
65+
# - runner: ubuntu-latest
66+
# target: x86_64
67+
# - runner: ubuntu-latest
68+
# target: x86
69+
# - runner: ubuntu-latest
70+
# target: aarch64
71+
# - runner: ubuntu-latest
72+
# target: armv7
73+
# module:
74+
# - geoarrow-core
75+
# - geoarrow-compute
76+
# steps:
77+
# - uses: actions/checkout@v4
78+
# - uses: actions/setup-python@v5
79+
# with:
80+
# python-version: 3.x
81+
# - name: Build wheels
82+
# uses: PyO3/maturin-action@v1
83+
# with:
84+
# target: ${{ matrix.platform.target }}
85+
# args: --release --out dist --find-interpreter --manifest-path python/${{ matrix.module }}/Cargo.toml
86+
# sccache: "true"
87+
# manylinux: musllinux_1_2
88+
# - name: Upload wheels
89+
# uses: actions/upload-artifact@v4
90+
# with:
91+
# name: wheels-musllinux-${{ matrix.platform.target }}-${{ matrix.module }}
92+
# path: dist
9293

9394
windows:
9495
runs-on: ${{ matrix.platform.runner }}
@@ -112,7 +113,7 @@ jobs:
112113
uses: PyO3/maturin-action@v1
113114
with:
114115
target: ${{ matrix.platform.target }}
115-
args: --release --out dist --manifest-path python/${{ matrix.module }}/Cargo.toml
116+
args: --release --out dist --find-interpreter --manifest-path python/${{ matrix.module }}/Cargo.toml
116117
sccache: "true"
117118
- name: Upload wheels
118119
uses: actions/upload-artifact@v4
@@ -125,8 +126,9 @@ jobs:
125126
strategy:
126127
matrix:
127128
platform:
128-
- runner: macos-12
129-
target: x86_64
129+
# Commented out because rust 1.82 apparently isn't distributed yet (as of Nov 13, 2024) for x86_64-apple-darwin? See https://github.com/geoarrow/geoarrow-rs/pull/860
130+
# - runner: macos-13
131+
# target: x86_64
130132
- runner: macos-14
131133
target: aarch64
132134
module:
@@ -141,7 +143,7 @@ jobs:
141143
uses: PyO3/maturin-action@v1
142144
with:
143145
target: ${{ matrix.platform.target }}
144-
args: --release --out dist --manifest-path python/${{ matrix.module }}/Cargo.toml
146+
args: --release --out dist --find-interpreter --manifest-path python/${{ matrix.module }}/Cargo.toml
145147
sccache: "true"
146148
- name: Upload wheels
147149
uses: actions/upload-artifact@v4
@@ -182,7 +184,7 @@ jobs:
182184
uses: PyO3/maturin-action@v1
183185
with:
184186
target: ${{ matrix.platform.target }}
185-
args: --release --out dist --no-default-features --manifest-path python/${{ matrix.module }}/Cargo.toml
187+
args: --release --out dist --find-interpreter --no-default-features --manifest-path python/${{ matrix.module }}/Cargo.toml
186188
sccache: "true"
187189
rust-toolchain: nightly
188190
- name: Upload wheels
@@ -210,7 +212,7 @@ jobs:
210212
name: Release
211213
runs-on: ubuntu-latest
212214
if: "startsWith(github.ref, 'refs/tags/')"
213-
needs: [linux, musllinux, windows, macos]
215+
needs: [linux, windows, macos]
214216
permissions:
215217
# Used to upload release artifacts
216218
contents: write

‎.github/workflows/python-io-wheels.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
target: ${{ matrix.target }}
3030
manylinux: manylinux_2_28
31-
args: --release --out dist -m python/geoarrow-io/Cargo.toml
31+
args: --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml
3232
before-script-linux: |
3333
yum update -y
3434
yum install openssl openssl-devel perl-IPC-Cmd -y
@@ -61,7 +61,7 @@ jobs:
6161
# with:
6262
# target: ${{ matrix.target }}
6363
# manylinux: auto
64-
# args: --release --out dist -m python/geoarrow-io/Cargo.toml
64+
# args: --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml
6565

6666
# # This is currently failing with
6767
# # python: command not found
@@ -96,7 +96,7 @@ jobs:
9696
fail-fast: false
9797
matrix:
9898
platform:
99-
- runner: macos-12
99+
- runner: macos-13
100100
target: x86_64
101101
- runner: macos-14
102102
target: aarch64
@@ -112,7 +112,7 @@ jobs:
112112
uses: PyO3/maturin-action@v1
113113
with:
114114
target: ${{ matrix.platform.target }}
115-
args: --release --out dist -m python/geoarrow-io/Cargo.toml
115+
args: --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml
116116
sccache: "true"
117117

118118
- name: Install built wheel - ${{ matrix.platform.target }}
@@ -145,7 +145,7 @@ jobs:
145145
uses: PyO3/maturin-action@v1
146146
with:
147147
target: ${{ matrix.target }}
148-
args: --release --out dist -m python/geoarrow-io/Cargo.toml
148+
args: --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml
149149

150150
- name: Install built wheel
151151
run: |
@@ -180,7 +180,7 @@ jobs:
180180
# with:
181181
# target: ${{ matrix.target }}
182182
# manylinux: musllinux_1_2
183-
# args: --release --out dist -m python/geoarrow-io/Cargo.toml
183+
# args: --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml
184184

185185
# - name: Install built wheel
186186
# if: matrix.target == 'x86_64-unknown-linux-musl'
@@ -222,7 +222,7 @@ jobs:
222222
# with:
223223
# target: ${{ matrix.platform.target }}
224224
# manylinux: musllinux_1_2
225-
# args: --release --out dist -m python/geoarrow-io/Cargo.toml
225+
# args: --release --out dist --find-interpreter -m python/geoarrow-io/Cargo.toml
226226

227227
# - uses: uraimo/[email protected]
228228
# name: Install built wheel

0 commit comments

Comments
 (0)