(wip) additional wheels for other archs

ariebovenberg · Jun 19, 2024 · e84cf52 · e84cf52
1 parent def6619
commit e84cf52
Show file tree

Hide file tree

Showing 3 changed files with 188 additions and 154 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -8,119 +8,119 @@ on:
   workflow_dispatch:
 
 jobs:
-  test-python-versions:
-    name: Test Python ${{ matrix.python-version }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [
-          "3.9",
-          "3.10",
-          "3.11",
-          "3.12",
-          "3.13-dev",
-        ]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
+  # test-python-versions:
+  #   name: Test Python ${{ matrix.python-version }}
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       python-version: [
+  #         "3.9",
+  #         "3.10",
+  #         "3.11",
+  #         "3.12",
+  #         "3.13-dev",
+  #       ]
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: actions-rust-lang/setup-rust-toolchain@v1
+  #     - uses: actions/setup-python@v5
+  #       with:
+  #         python-version: ${{ matrix.python-version }}
 
-      - name: "Test Rust"
-        if: ${{ (matrix.os == 'ubuntu-latest') && (matrix.python-version == '3.12') }}
-        run: |
-          cargo test
+  #     - name: "Test Rust"
+  #       if: ${{ (matrix.os == 'ubuntu-latest') && (matrix.python-version == '3.12') }}
+  #       run: |
+  #         cargo test
 
-      - name: Install and test
-        shell: bash
-        run: |
-          pip install .
-          pip install -r requirements/test.txt
-          pytest tests/
+  #     - name: Install and test
+  #       shell: bash
+  #       run: |
+  #         pip install .
+  #         pip install -r requirements/test.txt
+  #         pytest tests/
 
-  Test-os:
-    name: Test on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
+  # Test-os:
+  #   name: Test on ${{ matrix.os }}
+  #   runs-on: ${{ matrix.os }}
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       os: [ubuntu-latest, windows-latest, macos-latest]
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: actions-rust-lang/setup-rust-toolchain@v1
 
-      - uses: actions/setup-python@v5
-        if: ${{ !(matrix.os == 'windows-latest') }}
-        with:
-          python-version: '3.12'
+  #     - uses: actions/setup-python@v5
+  #       if: ${{ !(matrix.os == 'windows-latest') }}
+  #       with:
+  #         python-version: '3.12'
 
-      # ensure 32-bit target is tested
-      - uses: actions/setup-python@v5
-        if: ${{ matrix.os == 'windows-latest' }}
-        with:
-          python-version: '3.12'
-          architecture: x86
+  #     # ensure 32-bit target is tested
+  #     - uses: actions/setup-python@v5
+  #       if: ${{ matrix.os == 'windows-latest' }}
+  #       with:
+  #         python-version: '3.12'
+  #         architecture: x86
 
 
-      - name: Install and test
-        shell: bash
-        run: |
-          pip install -e .
-          pip install -r requirements/test.txt
-          pytest tests/
+  #     - name: Install and test
+  #       shell: bash
+  #       run: |
+  #         pip install -e .
+  #         pip install -r requirements/test.txt
+  #         pytest tests/
 
-  test-pure-python:
-    name: Test pure Python version
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [
-          "3.9",
-          "3.10",
-          "3.11",
-          "3.12",
-          "3.13-dev",
-          # # NOTE: pypy/pytest fails sometimes (https://github.com/pypy/pypy/issues/3959)
-          "pypy3.9",
-          "pypy3.10"
-        ]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      # only run coverage once
-      - if: ${{ matrix.python-version == '3.12' }}
-        run: |
-          pip install .
-          pip install -r requirements/test.txt
-          pytest tests/ --cov=whenever --cov-report=xml
-        env:
-          WHENEVER_NO_BUILD_RUST_EXT: "1"
-      - run: |
-          pip install .
-          pip install -r requirements/test.txt
-          pytest tests/
-        env:
-          WHENEVER_NO_BUILD_RUST_EXT: "1"
+  # test-pure-python:
+  #   name: Test pure Python version
+  #   runs-on: ubuntu-latest
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       python-version: [
+  #         "3.9",
+  #         "3.10",
+  #         "3.11",
+  #         "3.12",
+  #         "3.13-dev",
+  #         # # NOTE: pypy/pytest fails sometimes (https://github.com/pypy/pypy/issues/3959)
+  #         "pypy3.9",
+  #         "pypy3.10"
+  #       ]
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: actions/setup-python@v5
+  #       with:
+  #         python-version: ${{ matrix.python-version }}
+  #     # only run coverage once
+  #     - if: ${{ matrix.python-version == '3.12' }}
+  #       run: |
+  #         pip install .
+  #         pip install -r requirements/test.txt
+  #         pytest tests/ --cov=whenever --cov-report=xml
+  #       env:
+  #         WHENEVER_NO_BUILD_RUST_EXT: "1"
+  #     - run: |
+  #         pip install .
+  #         pip install -r requirements/test.txt
+  #         pytest tests/
+  #       env:
+  #         WHENEVER_NO_BUILD_RUST_EXT: "1"
 
-  Linting:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-      - run: |
-          pip install .
-          pip install -U pip
-          pip install -r requirements/lint.txt
-          make ci-lint
-        env:
-          WHENEVER_NO_BUILD_RUST_EXT: "1"
+  # Linting:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: actions/setup-python@v5
+  #       with:
+  #         python-version: '3.12'
+  #     - run: |
+  #         pip install .
+  #         pip install -U pip
+  #         pip install -r requirements/lint.txt
+  #         make ci-lint
+  #       env:
+  #         WHENEVER_NO_BUILD_RUST_EXT: "1"
 
   Typecheck:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - rust  # TODO remove
     tags:
       - '*'
   workflow_dispatch:
@@ -12,79 +13,110 @@ permissions:
   contents: read
 
 jobs:
-  linux:
-    runs-on: ubuntu-latest
+  wheels:
     strategy:
-      fail-fast: false  # TODO: unset
+      fail-fast: false
       matrix:
-        target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-      - name: Build wheels
-        run: |
-          pip install cibuildwheel==2.17.0
-          cibuildwheel --output-dir dist
-      - name: Upload wheels
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-linux-${{ matrix.target }}
-          path: dist/*.whl
+        os: [
+          # ubuntu-latest, 
+          # windows-latest, 
+          macos-latest
+        ]
+        target: [
+          x86_64, 
+          aarch64
+        ]
+        # include:
+          # - os: ubuntu-latest
+          #   target: i686
+          # - os: ubuntu-latest
+          #   target: aarch64
+          # - os: ubuntu-latest
+          #   target: armv7
+          # - os: ubuntu-latest
+          #   target: ppc64le
+          # - os: ubuntu-latest
+          #   target: s390x
 
-  windows:
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        target: [x64, x86]
+          # # musllinux
+          # - os: ubuntu-latest
+          #   target: x86_64
+          # - os: ubuntu-latest
+          #   target: aarch64
+
+          # - os: windows
+          #   target: i686
+
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
       - uses: actions/setup-python@v5
         with:
           python-version: '3.12'
           architecture: ${{ matrix.target }}
-      - name: Build wheels
-        run: |
-          pip install cibuildwheel==2.17.0
+      - run: pip install -U twine cibuildwheel==2.17.0
+      - run: |
           cibuildwheel --output-dir dist
+      - run: twine check --strict dist/*
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-windows-${{ matrix.target }}
+          name: wheels-linux-${{ matrix.target }}
           path: dist/*.whl
 
-  macos:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        target: [x86_64, aarch64]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-      - name: Build wheels
-        run: |
-          pip install cibuildwheel==2.17.0
-          cibuildwheel --output-dir dist
-      - name: Upload wheels
-        uses: actions/upload-artifact@v4
-        with:
-          name: wheels-macos-${{ matrix.target }}
-          path: dist/*.whl
+  # windows:
+  #   runs-on: windows-latest
+  #   strategy:
+  #     matrix:
+  #       target: [x64, x86]
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: actions/setup-python@v5
+  #       with:
+  #         python-version: '3.12'
+  #         architecture: ${{ matrix.target }}
+  #     - name: Build wheels
+  #       run: |
+  #         pip install cibuildwheel==2.17.0
+  #         cibuildwheel --output-dir dist
+  #     - run: twine check --strict dist/*
+  #     - name: Upload wheels
+  #       uses: actions/upload-artifact@v4
+  #       with:
+  #         name: wheels-windows-${{ matrix.target }}
+  #         path: dist/*.whl
+
+  # macos:
+  #   runs-on: macos-latest
+  #   strategy:
+  #     matrix:
+  #       target: [x86_64, aarch64]
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: actions/setup-python@v5
+  #       with:
+  #         python-version: '3.12'
+  #         architecture: ${{ matrix.target }}
+  #     - name: Build wheels
+  #       run: |
+  #         pip install cibuildwheel==2.17.0
+  #         cibuildwheel --output-dir dist
+  #     - run: twine check --strict dist/*
+  #     - name: Upload wheels
+  #       uses: actions/upload-artifact@v4
+  #       with:
+  #         name: wheels-macos-${{ matrix.target }}
+  #         path: dist/*.whl
 
   sdist:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Build sdist
         run: |
-          pip install build
+          pip install build twine
           python -m build --sdist --outdir dist
+      - run: twine check --strict dist/*
       - name: Upload sdist
         uses: actions/upload-artifact@v4
         with: