diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e038ce2..2bd2dfd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -105,8 +105,6 @@ jobs: - "3.15" os: [ubuntu-latest, macos-latest, windows-latest, windows-11-arm] exclude: - - os: macos-latest - python-version: "pypy-3.11" - os: windows-11-arm python-version: "pypy-3.11" @@ -213,6 +211,7 @@ jobs: - name: Upload persistent wheel (macOS x86_64) if: > startsWith(runner.os, 'Mac') + && !startsWith(matrix.python-version, 'pypy') uses: actions/upload-artifact@v7 with: # The x86_64 wheel is uploaded with a different name just so it can be @@ -223,7 +222,6 @@ jobs: - name: Upload persistent wheel (macOS arm64) if: > startsWith(runner.os, 'Mac') - && !startsWith(matrix.python-version, 'pypy') uses: actions/upload-artifact@v7 with: name: persistent-${{ runner.os }}-${{ matrix.python-version }}.whl @@ -268,8 +266,6 @@ jobs: - "3.15" os: [ubuntu-latest, macos-latest, windows-latest, windows-11-arm] exclude: - - os: macos-latest - python-version: "pypy-3.11" - os: windows-11-arm python-version: "pypy-3.11" @@ -574,8 +570,6 @@ jobs: - name: Remove undesired wheels (if any were downloaded) run: | - # PyPy wheels shouldn't be uploaded, remove them if present - find dist/ -name "*pypy*" -type f -delete || true find dist/ -name "*none-any*" -type f -delete || true # For Linux, we only want the manylinux wheels find dist/ -name "*linux_x86_64*" -type f -delete || true diff --git a/.manylinux-install.sh b/.manylinux-install.sh index f71e4bf..f572f8e 100755 --- a/.manylinux-install.sh +++ b/.manylinux-install.sh @@ -35,6 +35,7 @@ tox_env_map() { *"cp314"*) echo 'py314';; *"cp315t"*) echo 'py315t';; *"cp315"*) echo 'py315';; + *"pp311"*) echo 'pypy3';; *) echo 'py';; esac } @@ -42,6 +43,7 @@ tox_env_map() { # Compile wheels for PYBIN in /opt/python/*/bin; do if \ + [[ "${PYBIN}" == *"pp311-"* ]] || \ [[ "${PYBIN}" == *"cp311/"* ]] || \ [[ "${PYBIN}" == *"cp312/"* ]] || \ [[ "${PYBIN}" == *"cp313/"* ]] || \ diff --git a/.meta.toml b/.meta.toml index dffdca1..78b1861 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,7 +2,7 @@ # https://github.com/zopefoundation/meta/tree/master/src/zope/meta/c-code [meta] template = "c-code" -commit-id = "05320ebd" +commit-id = "2960b769" [python] with-windows = true diff --git a/CHANGES.rst b/CHANGES.rst index b7ca633..17d12df 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,7 @@ Change log 6.9 (unreleased) ---------------- +- Build and publish PyPy wheels for macOS, Windows and manylinux. - Add support for Python 3.15.