diff --git a/.github/mergify.yml b/.github/mergify.yml index ab2c5895..7945e034 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -4,7 +4,6 @@ pull_request_rules: - "#approved-reviews-by>=1" - label=automerge - status-success=Lint - - status-success=Travis CI - Pull Request - status-success=Wheels Successful actions: merge: diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh index 56397b78..9fcb3e55 100755 --- a/.github/workflows/build.sh +++ b/.github/workflows/build.sh @@ -1,5 +1,5 @@ -if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then +if [[ "$OS_NAME" == "osx" ]]; then # webp, zstd, xz, libtiff, libxcb cause a conflict with building webp, libtiff, libxcb # libxdmcp causes an issue on macOS < 11 # curl from brew requires zstd, use system curl @@ -20,6 +20,10 @@ if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then MB_PYTHON_OSX_VER="10.9" fi +if [[ "$PLAT" == "aarch64" ]]; then + docker run --rm --privileged aptman/qus -s -- -p $PLAT +fi + echo "::group::Install a virtualenv" source multibuild/common_utils.sh source multibuild/travis_steps.sh diff --git a/.github/workflows/wheels-linux.yml b/.github/workflows/wheels-linux.yml index de8745dd..53155593 100644 --- a/.github/workflows/wheels-linux.yml +++ b/.github/workflows/wheels-linux.yml @@ -16,7 +16,7 @@ env: jobs: build: - name: ${{ matrix.python }} ${{ matrix.mb-ml-libc }}${{ matrix.mb-ml-ver }} + name: ${{ matrix.platform }} ${{ matrix.mb-ml-libc }}${{ matrix.mb-ml-ver }} ${{ matrix.python }} runs-on: "ubuntu-latest" strategy: fail-fast: false @@ -30,26 +30,23 @@ jobs: "3.11", "3.12", ] - mb-ml-libc: [ "manylinux" ] - mb-ml-ver: [ 2014, "_2_28" ] - include: - - python: "3.8" + platform: [ "aarch64", "x86_64" ] + mb-ml-libc: [ "manylinux", "musllinux" ] + mb-ml-ver: [ 2014, "_1_1", "_2_28" ] + exclude: + - python: "pypy3.9-7.3.12" mb-ml-libc: "musllinux" - mb-ml-ver: "_1_1" - - python: "3.9" - mb-ml-libc: "musllinux" - mb-ml-ver: "_1_1" - - python: "3.10" - mb-ml-libc: "musllinux" - mb-ml-ver: "_1_1" - - python: "3.11" - mb-ml-libc: "musllinux" - mb-ml-ver: "_1_1" - - python: "3.12" + - python: "pypy3.10-7.3.12" mb-ml-libc: "musllinux" + - mb-ml-libc: "musllinux" + mb-ml-ver: 2014 + - mb-ml-libc: "manylinux" mb-ml-ver: "_1_1" + - mb-ml-libc: "musllinux" + mb-ml-ver: "_2_28" env: BUILD_COMMIT: ${{ inputs.build-commit }} + PLAT: ${{ matrix.platform }} MB_PYTHON_VERSION: ${{ matrix.python }} MB_ML_LIBC: ${{ matrix.mb-ml-libc }} MB_ML_VER: ${{ matrix.mb-ml-ver }} diff --git a/.github/workflows/wheels-macos.yml b/.github/workflows/wheels-macos.yml index 2a7169ff..a5b44dba 100644 --- a/.github/workflows/wheels-macos.yml +++ b/.github/workflows/wheels-macos.yml @@ -16,7 +16,7 @@ env: jobs: build: - name: ${{ matrix.python }} ${{ matrix.platform }} + name: ${{ matrix.platform }} ${{ matrix.python }} runs-on: "macos-latest" strategy: fail-fast: false @@ -40,7 +40,7 @@ jobs: BUILD_COMMIT: ${{ inputs.build-commit }} PLAT: ${{ matrix.platform }} MB_PYTHON_VERSION: ${{ matrix.python }} - TRAVIS_OS_NAME: "osx" + OS_NAME: "osx" steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 9c13f931..3e905a99 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -7,28 +7,28 @@ concurrency: cancel-in-progress: true jobs: - macos: - uses: ./.github/workflows/wheels-macos.yml + linux: + uses: ./.github/workflows/wheels-linux.yml with: build-commit: "HEAD" artifacts-name: "wheels" - linux: - uses: ./.github/workflows/wheels-linux.yml + macos: + uses: ./.github/workflows/wheels-macos.yml with: build-commit: "HEAD" artifacts-name: "wheels" - macos-latest: + linux-latest: if: "!startsWith(github.ref, 'refs/tags/')" - uses: ./.github/workflows/wheels-macos.yml + uses: ./.github/workflows/wheels-linux.yml with: build-commit: "main" artifacts-name: "wheels-latest" - linux-latest: + macos-latest: if: "!startsWith(github.ref, 'refs/tags/')" - uses: ./.github/workflows/wheels-linux.yml + uses: ./.github/workflows/wheels-macos.yml with: build-commit: "main" artifacts-name: "wheels-latest" @@ -49,7 +49,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} success: - needs: [macos, linux, macos-latest, linux-latest] + needs: [linux, macos, linux-latest, macos-latest] runs-on: ubuntu-latest name: Wheels Successful steps: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 193fa932..00000000 --- a/.travis.yml +++ /dev/null @@ -1,135 +0,0 @@ -env: - global: - - REPO_DIR=Pillow - - BUILD_COMMIT=HEAD - - PLAT=aarch64 - - TEST_DEPENDS="pytest-timeout" - -language: python -# Default Python version is usually 3.6 -python: "3.11" -dist: focal -services: docker - -jobs: - include: - - name: "3.8 Focal manylinux2014 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER=2014 - - MB_PYTHON_VERSION=3.8 - - name: "3.8 Focal manylinux_2_28 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER="_2_28" - - MB_PYTHON_VERSION=3.8 - - name: "3.8 musllinux_1_1 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER="_1_1" - - MB_ML_LIBC="musllinux" - - MB_PYTHON_VERSION=3.8 - - name: "3.9 Focal manylinux2014 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER=2014 - - MB_PYTHON_VERSION=3.9 - - name: "3.9 Focal manylinux_2_28 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER="_2_28" - - MB_PYTHON_VERSION=3.9 - - name: "3.9 musllinux_1_1 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER="_1_1" - - MB_ML_LIBC="musllinux" - - MB_PYTHON_VERSION=3.9 - - name: "3.10 Focal manylinux2014 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER=2014 - - MB_PYTHON_VERSION=3.10 - - name: "3.10 Focal manylinux_2_28 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER="_2_28" - - MB_PYTHON_VERSION=3.10 - - name: "3.10 musllinux_1_1 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER="_1_1" - - MB_ML_LIBC="musllinux" - - MB_PYTHON_VERSION=3.10 - - name: "3.11 Focal manylinux_2_28 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER=2014 - - MB_PYTHON_VERSION=3.11 - - name: "3.11 Focal manylinux_2_28 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER="_2_28" - - MB_PYTHON_VERSION=3.11 - - name: "3.11 musllinux_1_1 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER="_1_1" - - MB_ML_LIBC="musllinux" - - MB_PYTHON_VERSION=3.11 - - name: "3.12 Focal manylinux_2_28 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER=2014 - - MB_PYTHON_VERSION=3.12 - - name: "3.12 Focal manylinux_2_28 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER="_2_28" - - MB_PYTHON_VERSION=3.12 - - name: "3.12 musllinux_1_1 aarch64" - os: linux - arch: arm64 - env: - - MB_ML_VER="_1_1" - - MB_ML_LIBC="musllinux" - - MB_PYTHON_VERSION=3.12 - -before_install: - - source multibuild/common_utils.sh - - source multibuild/travis_steps.sh - - before_install - -install: - # Maybe get and clean and patch source - - clean_code - - build_multilinux aarch64 build_wheel - - ls -l "${TRAVIS_BUILD_DIR}/${WHEEL_SDIR}/" - -script: - - install_run - -# Upload wheels to GitHub Releases -deploy: - provider: releases - api_key: $GITHUB_RELEASE_TOKEN - file_glob: true - file: "${TRAVIS_BUILD_DIR}/${WHEEL_SDIR}/*.whl" - on: - repo: python-pillow/pillow-wheels - tags: true - skip_cleanup: true diff --git a/README.rst b/README.rst index 97709088..62c54af6 100644 --- a/README.rst +++ b/README.rst @@ -13,10 +13,6 @@ This repository creates wheels for tagged versions of Pillow:: :target: https://github.com/python-pillow/pillow-wheels/actions/workflows/wheels.yml :alt: GitHub Actions build status (Wheels) -.. image:: https://img.shields.io/travis/com/python-pillow/pillow-wheels/main.svg - :target: https://app.travis-ci.com/github/python-pillow/pillow-wheels - :alt: Travis CI build status - Archives -------- @@ -39,7 +35,7 @@ Wheels ------ Wheels are uploaded to https://github.com/python-pillow/pillow-wheels/releases. -Credentials for this specific repo are stored in a Travis CI secret, so the upload +Credentials for this specific repo are stored in a GitHub secret, so the upload won't work from another repository. Windows wheels are not created here. Instead, they are