Skip to content

Commit e090532

Browse files
authored
CIBW: remove non-ABI3 code (#377)
* CIBW: remove non-ABI3 code * Fix pipx for windows * fix * Do not use abi3audit, f windows
1 parent 2141cd2 commit e090532

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

.github/workflows/publish.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# We use the same order as in the table
4040
# * For Windows we support amd64 only
4141
# * For Linux we support ARM64, PPC64le, and x86_64
42-
# * For CPython we build ABI3 wheels on cp38 only
42+
# * We build wheels for CPython only, one per platform, compatible with ABI3.8
4343
# * We skip PPC64le MUSL Linux, because there is no Rust toolchain for it
4444
# * macos-12 runner is x86_64, macos-14 runner is arm64
4545
include:
@@ -91,14 +91,6 @@ jobs:
9191
CIBW_ARCHS=$(echo ${{ matrix.cibw_build }} | cut -d'_' -f2,3)
9292
echo "CIBW_ARCHS=${CIBW_ARCHS}" >> $GITHUB_ENV
9393
94-
- name: Set ABI3 build on Windows
95-
if: ${{ contains(matrix.cibw_build, 'cp3') && matrix.os == 'windows-2019' }}
96-
run: echo "LICU_ADDITIONAL_FEATURES=abi3" >> $env:GITHUB_ENV
97-
98-
- name: Set ABI3 build on Linux of macOS
99-
if: ${{ contains(matrix.cibw_build, 'cp3') && matrix.os != 'windows-2019' }}
100-
run: echo "LICU_ADDITIONAL_FEATURES=abi3" >> $GITHUB_ENV
101-
10294
- name: Build wheels
10395
uses: pypa/[email protected]
10496
with:
@@ -143,7 +135,7 @@ jobs:
143135
name: artifact_sdist
144136

145137
publish:
146-
needs: [cibuildwheel, sdist]
138+
needs: [ cibuildwheel, sdist ]
147139

148140
name: Publish light-curve
149141
runs-on: ubuntu-latest

light-curve/pyproject.toml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ full = [
3131
test-no-bench = [
3232
"pytest",
3333
"markdown-pytest",
34-
"pytest-benchmark", # We need it here because we use benchmark-specific command line options
34+
"pytest-benchmark", # We need it here because we use benchmark-specific command line options
3535
"pytest-subtests>=0.10",
3636
"iminuit>=2.21,<3",
3737
"numpy",
@@ -157,7 +157,7 @@ build-frontend = "build"
157157

158158
# - Set PATH to include Rust.
159159
# - Set maturin build options, including LICU_ADDITIONAL_FEATURES which may be passed through CIBW_ENVIRONMENT_PASS_LINUX
160-
environment = { "PATH" = "$PATH:$HOME/.cargo/bin", "MATURIN_PEP517_ARGS" = "--locked --no-default-features --features=mimalloc,ceres-system,fftw-system,gsl,${LICU_ADDITIONAL_FEATURES}" }
160+
environment = { "PATH" = "$PATH:$HOME/.cargo/bin", "MATURIN_PEP517_ARGS" = "--locked --no-default-features --features=abi3,ceres-system,fftw-system,gsl,mimalloc" }
161161

162162
# We use our own images which include Rust, GSL and platform-optimised FFTW
163163
# Manylinux CPython
@@ -183,10 +183,6 @@ musllinux-aarch64-image = "ghcr.io/light-curve/base-docker-images/musllinux_1_1_
183183
# musllinux-s390x-image = "ghcr.io/light-curve/base-docker-images/musllinux_1_1_s390x"
184184
musllinux-x86_64-image = "ghcr.io/light-curve/base-docker-images/musllinux_1_1_x86_64"
185185

186-
[tool.cibuildwheel.linux]
187-
# We use this variable to set additional Cargo features, such as 'abi3'
188-
environment-pass = ["LICU_ADDITIONAL_FEATURES"]
189-
190186
[tool.cibuildwheel.macos]
191187
before-all = [
192188
# Install Rust
@@ -205,13 +201,13 @@ before-all = [
205201
before-build = ["pip install delvewheel"]
206202
repair-wheel-command = "delvewheel repair --add-path=%USERPROFILE%\\Downloads\\fftw-dll64 -w {dest_dir} {wheel}"
207203
# We do not support Ceres and GSL on Windows
208-
environment = { "PATH" = "$PATH:$HOME/.cargo/bin", "MATURIN_PEP517_ARGS" = "--locked --no-default-features --features=mimalloc,fftw-source,${LICU_ADDITIONAL_FEATURES}" }
204+
environment = { "PATH" = "$PATH:$HOME/.cargo/bin", "MATURIN_PEP517_ARGS" = "--locked --no-default-features --features=abi3,fftw-source,mimalloc" }
209205

210206
# Build with Intel MKL on Linux x86_64
211207
[[tool.cibuildwheel.overrides]]
212208
select = "*linux_x86_64"
213209
# We'd like to use MKL for x86_64
214-
environment = { "PATH" = "$PATH:$HOME/.cargo/bin", "MATURIN_PEP517_ARGS" = "--locked --no-default-features --features=mimalloc,ceres-system,fftw-mkl,gsl,${LICU_ADDITIONAL_FEATURES}" }
210+
environment = { "PATH" = "$PATH:$HOME/.cargo/bin", "MATURIN_PEP517_ARGS" = "--locked --no-default-features --features=abi3,ceres-system,fftw-mkl,gsl,mimalloc" }
215211

216212
# Test
217213
# We skip benchmark tests, because it requires feets and its transitive

0 commit comments

Comments
 (0)