Add Python 3.12 to CI (#21)

* Add Python 3.12 to CI * Bump maturin to recent commit supporting 3.12 * Remove --universal2 and add python3.12-venv * fail-fast: false --------- Co-authored-by: Miles Granger <[email protected]>
milesgranger · Oct 4, 2023 · b920ead · b920ead
1 parent 6ff872d
commit b920ead
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 80 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -15,8 +15,9 @@ jobs:
   macos:
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -34,15 +35,6 @@ jobs:
       - name: Install built wheel - x86_64
         run: |
           pip install gilknocker --no-index --find-links dist --force-reinstall
-      - name: Build wheels - universal2
-        if: ${{ matrix.python-version >= '3.8' || contains(fromJson('["3.10", "3.11"]'), matrix.python-version) }}
-        uses: PyO3/maturin-action@v1
-        with:
-          args: -i python --release --universal2 --out dist
-      - name: Install built wheel - universal2
-        if: ${{ matrix.python-version >= '3.8' || contains(fromJson('["3.10", "3.11"]'), matrix.python-version) }}
-        run: |
-          pip install gilknocker --no-index --find-links dist --force-reinstall
       - name: Python UnitTest
         run: |
           pip install -r requirements-dev.txt
@@ -58,7 +50,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         target: [x64, x86]
     steps:
       - uses: actions/checkout@v2
@@ -97,7 +89,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         target: [x86_64, i686]
     steps:
     - uses: actions/checkout@v2
@@ -131,6 +123,7 @@ jobs:
   pypy-linux:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         python:
           - pypy-3.7
@@ -169,6 +162,7 @@ jobs:
   pypy-macos:
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
         python-version: [ pypy-3.7, pypy-3.8, pypy-3.9 ]
     steps:
@@ -209,13 +203,15 @@ jobs:
   linux-cross:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         python:
           - '3.7'
           - '3.8'
           - '3.9'
           - '3.10'
           - '3.11'
+          - '3.12'
         target: [aarch64, armv7, s390x, ppc64le]
         include:
           - python: pypy3.7
@@ -257,7 +253,7 @@ jobs:
           apt-get install -y --no-install-recommends python3 python3-venv software-properties-common
           add-apt-repository ppa:deadsnakes/ppa
           apt-get update
-          apt-get install -y curl python3.7-venv python3.9-venv python3.10-venv python3.11-venv
+          apt-get install -y curl python3.7-venv python3.9-venv python3.10-venv python3.11-venv python3.12-venv
         run: |
           ls -lrth /artifacts
           PYTHON=python${{ matrix.python }}
@@ -289,4 +285,4 @@ jobs:
           TWINE_PASSWORD: ${{ secrets.TWINE_TOKEN }}
         run: |
           pip install --upgrade wheel pip setuptools twine
-          twine upload --skip-existing *
+          twine upload --skip-existing *
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,5 +19,5 @@ codegen-units = 1
 opt-level = 3
 
 [dependencies]
-pyo3 = { version = "0.18.2", features = ["extension-module"] }
+pyo3 = { git = "https://github.com/PyO3/pyo3.git", rev="90cc69b", features = ["extension-module"] }
 parking_lot = "^0.12"