Merge branch 'pr/80'

* pr/80: Make Python versions in GitHub Actions consistent
crate-py · Jul 24, 2024 · f903627 · f903627
2 parents 27b37db + e4865c4
commit f903627
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 9 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -56,6 +56,7 @@ jobs:
  3.11
  3.12
  3.13
+ pypy3.9
  pypy3.10
  allow-prereleases: true
  - name: Set up uv
@@ -76,12 +77,21 @@ jobs:
  - uses: actions/checkout@v4
  - uses: actions/setup-python@v5
  with:
- python-version: "3.x"
+ python-version: |
+ 3.8
+ 3.9
+ 3.10
+ 3.11
+ 3.12
+ 3.13
+ pypy3.9
+ pypy3.10
+ allow-prereleases: true
  - name: Build wheels
  uses: PyO3/maturin-action@v1
  with:
  target: ${{ matrix.target }}
- args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 pypy3.8 pypy3.9 pypy3.10'
+ args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
  sccache: "true"
  manylinux: auto
  - name: Upload wheels
@@ -103,12 +113,21 @@ jobs:
  - uses: actions/checkout@v4
  - uses: actions/setup-python@v5
  with:
- python-version: "3.x"
+ python-version: |
+ 3.8
+ 3.9
+ 3.10
+ 3.11
+ 3.12
+ 3.13
+ pypy3.9
+ pypy3.10
+ allow-prereleases: true
  - name: Build wheels
  uses: PyO3/maturin-action@v1
  with:
  target: ${{ matrix.target }}
- args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 pypy3.8 pypy3.9 pypy3.10'
+ args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
  manylinux: musllinux_1_2
  sccache: "true"
  - name: Upload wheels
@@ -122,7 +141,7 @@ jobs:
  runs-on: windows-latest
  strategy:
  matrix:
- target: [x64, x86]
+ target: [x64, x86] # x86 is not supported by pypy
  steps:
  - uses: actions/checkout@v4
  - uses: actions/setup-python@v5
@@ -133,12 +152,16 @@ jobs:
  3.10
  3.11
  3.12
+ 3.13
+ ${{ matrix.target == 'x64' && 'pypy3.9' || '' }}
+ ${{ matrix.target == 'x64' && 'pypy3.10' || '' }}
+ allow-prereleases: true
  architecture: ${{ matrix.target }}
  - name: Build wheels
  uses: PyO3/maturin-action@v1
  with:
  target: ${{ matrix.target }}
- args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12'
+ args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 3.13' --interpreter ${{ matrix.target == 'x64' && 'pypy3.9 pypy3.10' || '' }}
  sccache: "true"
  - name: Upload wheels
  uses: actions/upload-artifact@v4
@@ -156,12 +179,21 @@ jobs:
  - uses: actions/checkout@v4
  - uses: actions/setup-python@v5
  with:
- python-version: "3.x"
+ python-version: |
+ 3.8
+ 3.9
+ 3.10
+ 3.11
+ 3.12
+ 3.13
+ pypy3.9
+ pypy3.10
+ allow-prereleases: true
  - name: Build wheels
  uses: PyO3/maturin-action@v1
  with:
  target: ${{ matrix.target }}
- args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 pypy3.8 pypy3.9 pypy3.10'
+ args: --release --out dist --interpreter '3.8 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10'
  sccache: "true"
  - name: Upload wheels
  uses: actions/upload-artifact@v4
@@ -174,6 +206,18 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v4
+ - uses: actions/setup-python@v5
+ with:
+ python-version: |
+ 3.8
+ 3.9
+ 3.10
+ 3.11
+ 3.12
+ 3.13
+ pypy3.9
+ pypy3.10
+ allow-prereleases: true
  - name: Build an sdist
  uses: PyO3/maturin-action@v1
  with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,4 +13,6 @@ archery = "1.2.0"
 
 [dependencies.pyo3]
 version = "0.22.2"
-features = ["extension-module"]
+# To build extension for PyPy on Windows, "generate-import-lib" is needed:
+# https://github.com/PyO3/maturin-action/issues/267#issuecomment-2106844429
+features = ["extension-module", "generate-import-lib"]