From 9eaa51f47ea32fd71389268efee7e895372c7ac7 Mon Sep 17 00:00:00 2001 From: Icxolu <10486322+Icxolu@users.noreply.github.com> Date: Wed, 20 Nov 2024 20:30:53 +0100 Subject: [PATCH] drop support for PyPy 3.7 and 3.8 Upstream PyO3 does not support PyPy 3.7 and 3.8 anymore since 0.23. Testing against PyPy 3.9 and 3.10 now. --- .github/workflows/ci.yml | 48 ++++++++++++++++++++++++---------------- CHANGELOG.md | 3 ++- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21f8bacf..f4e80141 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,18 @@ jobs: strategy: fail-fast: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-no-fail-fast') }} matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: + [ + "3.7", + "3.8", + "3.9", + "3.10", + "3.11", + "3.12", + "3.13", + "pypy-3.9", + "pypy-3.10", + ] platform: [ { @@ -71,29 +82,28 @@ jobs: python-architecture: "arm64", rust-target: "aarch64-apple-darwin", } - # NumPy does not provide pre-built wheels for PyPy on macOS and Windows - - python-version: pypy-3.7 + exclude: + # ubuntu-24.04 does not support 3.7 + - python-version: 3.7 platform: { os: "ubuntu-latest", python-architecture: "x64", rust-target: "x86_64-unknown-linux-gnu", } - - python-version: pypy-3.8 + - python-version: pypy-3.9 platform: { - os: "ubuntu-latest", - python-architecture: "x64", - rust-target: "x86_64-unknown-linux-gnu", + os: "windows-latest", + python-architecture: "x86", + rust-target: "i686-pc-windows-msvc", } - exclude: - # ubuntu-24.04 does not support 3.7 - - python-version: 3.7 + - python-version: pypy-3.10 platform: { - os: "ubuntu-latest", - python-architecture: "x64", - rust-target: "x86_64-unknown-linux-gnu", + os: "windows-latest", + python-architecture: "x86", + rust-target: "i686-pc-windows-msvc", } steps: - uses: actions/checkout@v4 @@ -201,7 +211,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: "3.12" - uses: messense/maturin-action@v1 with: target: aarch64 @@ -215,7 +225,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: "3.12" - uses: dtolnay/rust-toolchain@stable - uses: Swatinem/rust-cache@v2 continue-on-error: true @@ -233,7 +243,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: "3.12" - uses: dtolnay/rust-toolchain@nightly - uses: Swatinem/rust-cache@v2 continue-on-error: true @@ -249,7 +259,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: "3.12" - name: Install Rust uses: dtolnay/rust-toolchain@1.63 - uses: Swatinem/rust-cache@v2 @@ -292,7 +302,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: "3.12" - name: Install OpenBLAS run: sudo apt install --yes libopenblas-dev - name: Install Rust @@ -312,7 +322,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: "3.12" - name: Install numpy run: pip install "numpy" ml_dtypes - uses: Swatinem/rust-cache@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index e004f8cf..c15cc0b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Changelog - +- v0.23.0 + - Drop support for PyPy 3.7 and 3.8. ([#470](https://github.com/PyO3/rust-numpy/pull/470)) - v0.22.1 - Fix building on 32-bit Windows. ([#463](https://github.com/PyO3/rust-numpy/pull/463)) - Add `PyReadwriteArray::make_nonwriteable`. ([#462](https://github.com/PyO3/rust-numpy/pull/462))