mypyc build improvements (#3881)

Build in separate jobs. This makes it clearer if e.g. a single Python
version is failing. It also potentially gets you more parallelism.

Build everything on push to master.

Only build Linux 3.8 and 3.11 wheels on PRs.
This commit is contained in:
Shantanu 2023-09-11 13:36:37 -07:00 committed by GitHub
parent 14f60c84c8
commit 004fb79706
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 23 deletions

View File

@ -1,9 +1,12 @@
name: Build wheels and publish to PyPI name: Build and publish
on: on:
release: release:
types: [published] types: [published]
pull_request: pull_request:
push:
branches:
- main
permissions: permissions:
contents: read contents: read
@ -12,6 +15,7 @@ jobs:
main: main:
name: sdist + pure wheel name: sdist + pure wheel
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.event_name == 'release'
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -35,34 +39,58 @@ jobs:
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
run: twine upload --verbose -u '__token__' dist/* run: twine upload --verbose -u '__token__' dist/*
generate_wheels_matrix:
name: generate wheels matrix
runs-on: ubuntu-latest
outputs:
include: ${{ steps.set-matrix.outputs.include }}
steps:
- uses: actions/checkout@v3
- name: Install cibuildwheel and pypyp
run: |
pipx install cibuildwheel==2.15.0
pipx install pypyp==1
- name: generate matrix
if: github.event_name != 'pull_request'
run: |
{
cibuildwheel --print-build-identifiers --platform linux \
| pyp 'json.dumps({"only": x, "os": "ubuntu-latest"})' \
&& cibuildwheel --print-build-identifiers --platform macos \
| pyp 'json.dumps({"only": x, "os": "macos-latest"})' \
&& cibuildwheel --print-build-identifiers --platform windows \
| pyp 'json.dumps({"only": x, "os": "windows-latest"})'
} | pyp 'json.dumps(list(map(json.loads, lines)))' > /tmp/matrix
env:
CIBW_ARCHS_LINUX: x86_64
CIBW_ARCHS_MACOS: x86_64 arm64
CIBW_ARCHS_WINDOWS: AMD64
- name: generate matrix (PR)
if: github.event_name == 'pull_request'
run: |
cibuildwheel --print-build-identifiers --platform linux \
| pyp 'json.dumps({"only": x, "os": "ubuntu-latest"})' \
| pyp 'json.dumps(list(map(json.loads, lines)))' > /tmp/matrix
env:
CIBW_BUILD: "cp38-* cp311-*"
CIBW_ARCHS_LINUX: x86_64
- id: set-matrix
run: echo "include=$(cat /tmp/matrix)" | tee -a $GITHUB_OUTPUT
mypyc: mypyc:
name: mypyc wheels (${{ matrix.name }}) name: mypyc wheels ${{ matrix.only }}
needs: generate_wheels_matrix
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
include: include: ${{ fromJson(needs.generate_wheels_matrix.outputs.include) }}
- os: ubuntu-latest
name: linux-x86_64
- os: windows-2019
name: windows-amd64
- os: macos-11
name: macos-x86_64
macos_arch: "x86_64"
- os: macos-11
name: macos-arm64
macos_arch: "arm64"
- os: macos-11
name: macos-universal2
macos_arch: "universal2"
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: pypa/cibuildwheel@v2.15.0
- name: Build wheels via cibuildwheel with:
uses: pypa/cibuildwheel@v2.15.0 only: ${{ matrix.only }}
env:
CIBW_ARCHS_MACOS: "${{ matrix.macos_arch }}"
- name: Upload wheels as workflow artifacts - name: Upload wheels as workflow artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
@ -80,6 +108,7 @@ jobs:
name: Update stable branch name: Update stable branch
needs: [main, mypyc] needs: [main, mypyc]
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.event_name == 'release'
permissions: permissions:
contents: write contents: write

View File

@ -145,8 +145,8 @@ build-verbosity = 1
# - Python: CPython 3.8+ only # - Python: CPython 3.8+ only
# - Architecture (64-bit only): amd64 / x86_64, universal2, and arm64 # - Architecture (64-bit only): amd64 / x86_64, universal2, and arm64
# - OS: Linux (no musl), Windows, and macOS # - OS: Linux (no musl), Windows, and macOS
build = "cp3*-*" build = "cp3*"
skip = ["*-manylinux_i686", "*-musllinux_*", "*-win32", "pp-*", "cp312-*"] skip = ["*-manylinux_i686", "*-musllinux_*", "*-win32", "pp*", "cp312-*"]
# This is the bare minimum needed to run the test suite. Pulling in the full # This is the bare minimum needed to run the test suite. Pulling in the full
# test_requirements.txt would download a bunch of other packages not necessary # test_requirements.txt would download a bunch of other packages not necessary
# here and would slow down the testing step a fair bit. # here and would slow down the testing step a fair bit.