(wip) additional wheels for other archs

.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

.github/workflows/wheels.yml

@@ -4,6 +4,7 @@ on:
  push:
  branches:
  - main
+ - rust # TODO remove
  tags:
  - '*'
  workflow_dispatch:
@@ -12,90 +13,68 @@ permissions:
  contents: read
 
 jobs:
- linux:
- runs-on: ubuntu-latest
+ binary:
+ name: build on ${{ matrix.os }} - ${{ matrix.target || 'all' }}
  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
+ include:
+ # TODO reactivate
+ # - os: windows-latest
+ # - os: macos-latest
+ # - os: ubuntu-latest
+ # target: x86_64
+ # - os: ubuntu-latest
+ # target: i686
+ - os: ubuntu-latest
+ target: aarch64
+ - os: ubuntu-latest
+ target: ppc64le
+ - os: ubuntu-latest
+ target: s390x
 
- windows:
- runs-on: windows-latest
- strategy:
- matrix:
- target: [x64, x86]
+ runs-on: ${{ matrix.os }}
  steps:
  - uses: actions/checkout@v4
- - uses: actions-rust-lang/setup-rust-toolchain@v1
- - uses: actions/setup-python@v5
+ - name: Set up QEMU
+ if: runner.os == 'Linux'
+ uses: docker/setup-qemu-action@v3
  with:
- python-version: '3.12'
- architecture: ${{ matrix.target }}
- - 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-windows-${{ 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
+ platforms: all
  - uses: actions/setup-python@v5
  with:
  python-version: '3.12'
- - name: Build wheels
- run: |
- pip install cibuildwheel==2.17.0
- cibuildwheel --output-dir dist
+ - run: pip install -U twine cibuildwheel==2.19.1
+ - run: cibuildwheel --output-dir dist
+ env:
+ CIBW_ARCHS: ${{ matrix.target || 'auto' }}
+ - run: twine check --strict dist/*
  - name: Upload wheels
  uses: actions/upload-artifact@v4
  with:
- name: wheels-macos-${{ matrix.target }}
- path: dist/*.whl
+ name: wheels-binary-${{ runner.os }}-${{ matrix.target || 'all' }}
+ path: dist/*
 
  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:
  name: wheels-sdist
- path: dist
+ path: dist/*
 
  release:
  name: Release
  runs-on: ubuntu-latest
  if: "startsWith(github.ref, 'refs/tags/')"
- needs: [linux, windows, macos, sdist]
+ needs: [binary, sdist]
  steps:
  - uses: actions/download-artifact@v4
  - name: Publish to PyPI

pyproject.toml

@@ -84,7 +84,8 @@ module = [
 ignore_missing_imports = true
 
 [tool.cibuildwheel]
-skip = ["pp*", "*-musllinux_i686"]
+skip = ["pp*", "*-musllinux_i686", "*-musllinux_ppc64le"]
+free-threaded-support = true
 test-command = "pytest -s {project}/tests"
 test-requires = [
  "pytest",
@@ -96,11 +97,16 @@ environment = { PATH = "$HOME/.cargo/bin:$PATH" }
 
 [tool.cibuildwheel.linux]
 before-all = "curl -sSf https://sh.rustup.rs | sh -s -- -y"
+archs = ["x86_64", "i686", "aarch64", "ppc64le", "s390x"]
 
 [tool.cibuildwheel.windows]
 before-all = "rustup target add i686-pc-windows-msvc"
 environment = { PATH = "$UserProfile\\.cargo\\bin;$PATH" }
 
+[tool.cibuildwheel.macos]
+before-all = "rustup target add x86_64-apple-darwin"
+archs = ["x86_64", "arm64"]
+
 [[tool.cibuildwheel.overrides]]
 select = "*-musllinux*"
 before-all = "curl -sSf https://sh.rustup.rs | sh -s -- -y && apk add tzdata"

setup.py

@@ -1,5 +1,6 @@
 import os
 
+import platform
 from setuptools import setup
 from setuptools_rust import Binding, RustExtension, build_rust
 
@@ -27,6 +28,7 @@ def run(self):
  rust_extensions=(
  []
  if os.getenv("WHENEVER_NO_BUILD_RUST_EXT")
+ or platform.python_implementation() == "PyPy"
  else [RustExtension("whenever._whenever", binding=Binding.PyO3)]
  ),
  cmdclass={"build_rust": CustomBuildExtCommand},