Update dependencies and simplify CI (#79)

milesgranger · May 18, 2022 · dc1775b · dc1775b
1 parent 0abcd5c
commit dc1775b
Show file tree

Hide file tree

Showing 2 changed files with 118 additions and 111 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -126,7 +126,7 @@ jobs:
       with:
         target: ${{ matrix.target }}
         manylinux: auto
-        args: -i python${{ matrix.python-version }} --release --out dist --no-sdist
+        args: -i ${{ matrix.python-version }} --release --out dist --no-sdist
     - name: Python UnitTest
       if: matrix.target == 'x86_64'
       run: |
@@ -154,36 +154,30 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: [
-          { version: '3.7', abi: 'cp37-cp37m' },
-          { version: '3.8', abi: 'cp38-cp38' },
-          { version: '3.9', abi: 'cp39-cp39' },
-          { version: '3.10', abi: 'cp310-cp310' },
-        ]
-        target: [aarch64, armv7, s390x, ppc64le, ppc64]
+        python:
+          - '3.7'
+          - '3.8'
+          - '3.9'
+          - '3.10'
+        target: [aarch64, armv7, s390x, ppc64le]
         include:
-          - python:
-              version: 3.7
-              abi: pp37-pypy37_pp73
+          - python: pypy3.7
             target: aarch64
-          - python:
-              version: 3.8
-              abi: pp38-pypy38_pp73
+          - python: pypy3.8
+            target: aarch64
+          - python: pypy3.9
             target: aarch64
     steps:
     - uses: actions/checkout@v2
     - name: Build Wheels
       uses: messense/maturin-action@v1
-      env:
-        PYO3_CROSS_LIB_DIR: /opt/python/${{ matrix.python.abi }}
       with:
         target: ${{ matrix.target }}
         manylinux: auto
-        args: -i python3.9 --release --out dist --no-sdist --cargo-extra-args="--no-default-features" --cargo-extra-args="--features=extension-module"  # disable mimallocator
-    - uses: uraimo/run-on-arch-action@v2.0.5
-      # run-on-arch-action doesn't have ppc64 support
+        args: -i ${{ matrix.python }} --release --out dist --no-sdist --cargo-extra-args="--no-default-features" --cargo-extra-args="--features=extension-module"  # disable mimallocator
+    - uses: uraimo/run-on-arch-action@v2.2.0
       # skipped cross compiled pypy wheel tests for now
-      if: ${{ matrix.target != 'ppc64' && !startsWith(matrix.python.abi, 'pp') }}
+      if: ${{ !startsWith(matrix.python, 'pypy') }}
       name: Install built wheel
       with:
         arch: ${{ matrix.target }}
@@ -200,7 +194,7 @@ jobs:
           apt-get install -y curl python3.7-venv python3.9-venv python3.10-venv
         run: |
           ls -lrth /artifacts
-          PYTHON=python${{ matrix.python.version }}
+          PYTHON=python${{ matrix.python }}
           $PYTHON -m venv venv
           venv/bin/pip install -U pip
           venv/bin/pip install cramjam --no-index --find-links /artifacts --force-reinstall
@@ -215,21 +209,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: [
-          { version: pypy-3.7, abi: pp37-pypy37_pp73 },
-          { version: pypy-3.8, abi: pp38-pypy38_pp73 },
-        ]
+        python:
+          - pypy-3.7
+          - pypy-3.8
+          - pypy-3.9
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
       with:
-        python-version: ${{ matrix.python.version }}
+        python-version: ${{ matrix.python }}
     - name: Build Wheels
       uses: messense/maturin-action@v1
       with:
         target: ${{ matrix.target }}
         manylinux: auto
-        args: -i /opt/python/${{ matrix.python.abi }}/bin/pypy --release --out dist --no-sdist --cargo-extra-args="--no-default-features" --cargo-extra-args="--features=extension-module"  # disable mimallocator
+        args: -i ${{ matrix.python }} --release --out dist --no-sdist --cargo-extra-args="--no-default-features" --cargo-extra-args="--features=extension-module"  # disable mimallocator
     - name: Python UnitTest
       run: |
         pip install cramjam --no-index --find-links dist
@@ -244,7 +238,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        python-version: [ pypy-3.7, pypy-3.8 ]
+        python-version: [ pypy-3.7, pypy-3.8, pypy-3.9 ]
     steps:
     - uses: actions/checkout@v2
     - name: Install Rust toolchain