Merge pull request #69 from remyroy/master

Update and fix build process. Include Python 3.13 and pypy 3.11 targets.

Author: amitdev

.github/workflows/build-and-deploy.yml

@@ -8,29 +8,32 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-2022, macOS-11]
+        os: [ubuntu-22.04, windows-2022, macos-14]
 
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU
         if: runner.os == 'Linux'
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: all
       # Used to host cibuildwheel
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.2
+        uses: pypa/cibuildwheel@v2.23.0
         env:
           # configure cibuildwheel to build native archs ('auto'), and some emulated ones
           CIBW_ARCHS_LINUX: auto aarch64 ppc64le
           CIBW_ARCHS_MACOS: x86_64 arm64 universal2
           CIBW_TEST_REQUIRES: .[test]
           CIBW_TEST_COMMAND: pytest {project}
-          # arm64 cannot be tested on a x86_64 CI runner
-          CIBW_TEST_SKIP: "*-macosx_arm64"
-      - uses: actions/upload-artifact@v3
+          # cannot test the arm64 part for CPython 3.8 universal2/arm64, see https://github.com/pypa/cibuildwheel/pull/1169
+          CIBW_TEST_SKIP: cp38-macosx_arm64
+          # pypy will need to be enabled for cibuildwheel 3
+          CIBW_ENABLE: pypy
+      - uses: actions/upload-artifact@v4
         with:
           path: ./wheelhouse/*.whl
+          name: wheels-${{ matrix.os }}
 
   build_sdist:
     name: Build source distribution
@@ -39,20 +42,20 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build sdist
         run: pipx run build --sdist
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: dist/*.tar.gz
+          name: source-dist
 
   pypi_upload:
     name: Publish to PyPI
     needs: [build_wheels, build_sdist]
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
     steps:
-    - uses: actions/setup-python@v4
-    - uses: actions/download-artifact@v3
+    - uses: actions/setup-python@v5
+    - uses: actions/download-artifact@v4
       with:
-        name: artifact
         path: dist
     - name: Publish package
       uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/tests.yml

@@ -14,14 +14,16 @@ jobs:
             "3.10",
             "3.11",
             "3.12",
+            "3.13",
             "pypy-3.8",
             "pypy-3.9",
             "pypy-3.10",
+            "pypy-3.11",
           ]
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
       - run: pip install .[test]
@@ -38,14 +40,16 @@ jobs:
             "3.10",
             "3.11",
             "3.12",
+            "3.13",
             "pypy-3.8",
             "pypy-3.9",
             "pypy-3.10",
+            "pypy-3.11",
           ]
 
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
       - run: pip install .