Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to ABI3 forward-compatible wheels #2

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions .github/workflows/dists.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,55 +14,46 @@ concurrency: # https://stackoverflow.com/questions/66335225#comment133398800_72

jobs:
wheel:
name: ${{ matrix.os }}-${{ matrix.target }}-${{ matrix.interpreter }}-${{ matrix.manylinux }}-${{ matrix.python-architecture }}
name: ${{ matrix.os }}-${{ matrix.target }}-${{ matrix.manylinux }}-${{ matrix.python-architecture }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
target: [x86_64, aarch64]
manylinux: [auto]
interpreter: [all]
python-architecture: [x64]
include:
- os: windows-latest
target: i686
manylinux: auto
interpreter: all
python-architecture: x86
- os: ubuntu-latest
target: i686
manylinux: auto
interpreter: all
python-architecture: x64
- os: ubuntu-latest
target: aarch64
manylinux: auto
interpreter: all
python-architecture: x64
- os: ubuntu-latest
target: armv7
manylinux: auto
interpreter: all
python-architecture: x64
- os: ubuntu-latest
target: ppc64le
manylinux: auto
interpreter: all
python-architecture: x64
- os: ubuntu-latest
target: s390x
manylinux: auto
interpreter: all
python-architecture: x64
- os: ubuntu-latest
target: x86_64
manylinux: musllinux_1_1
interpreter: all
python-architecture: x64
- os: ubuntu-latest
target: aarch64
manylinux: musllinux_1_1
interpreter: all
python-architecture: x64
exclude:
# FIXME aarch64 builds broken, see https://github.com/PyO3/maturin/issues/2110
Expand All @@ -82,8 +73,7 @@ jobs:
with:
target: ${{ matrix.target }}
manylinux: ${{ matrix.manylinux }}
# Keep in sync with tests.yml
args: --release --out dist --interpreter ${{ matrix.interpreter == 'all' && '3.8 3.9 3.10 3.11 3.12' || matrix.interpreter }}
args: --release --out dist
rust-toolchain: stable
docker-options: -e CI

Expand All @@ -93,7 +83,7 @@ jobs:

- uses: actions/upload-artifact@v4
with:
name: dist-${{ matrix.os }}-${{ matrix.target }}-${{ matrix.interpreter }}-${{ matrix.manylinux }}-${{ matrix.python-architecture }}
name: dist-${{ matrix.os }}-${{ matrix.target }}-${{ matrix.manylinux }}-${{ matrix.python-architecture }}
path: dist

sdist:
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ jobs:
runs-on: ${{ matrix.platform.os }}
strategy:
matrix:
# Keep in sync with:
# - dists.yml
# - the c_impl tests below
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
# Keep in sync with c_impl tests below
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
rust-toolchain: [stable, beta, nightly]
platform: [
{ os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu", name: "ubuntu-x64" },
Expand Down Expand Up @@ -58,10 +56,8 @@ jobs:
runs-on: ${{ matrix.platform.os }}
strategy:
matrix:
# Keep in sync with:
# - dists.yml
# - the rust_impl tests above
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
# Keep in sync with rust_impl tests above
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
platform: [
# This list should be kept in sync with dists.yml.
{ os: "ubuntu-latest", python-architecture: "x64", name: "ubuntu-x64" },
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ neon = ["blake3/neon"]
[dependencies]
blake3 = { version = "1.5", features = ["mmap", "rayon"] }
hex = "0.4.2"
pyo3 = { version = "0.20.0", features = ["extension-module"] }
pyo3 = { version = "0.20.0", features = ["abi3-py38", "extension-module"] }
rayon = "1.2.1"
Loading