Merge branch 'main' into zlib-ng-with-sip

Author: radarhere

.appveyor.yml

@@ -2,8 +2,4 @@
 
 # gather the coverage data
 python3 -m pip install coverage
-if [[ $MATRIX_DOCKER ]]; then
- python3 -m coverage xml --ignore-errors
-else
- python3 -m coverage xml
-fi
+python3 -m coverage xml

.ci/after_success.sh

@@ -3,8 +3,5 @@
 set -e
 
 python3 -m coverage erase
-if [ $(uname) == "Darwin" ]; then
- export CPPFLAGS="-I/usr/local/miniconda/include";
-fi
 make clean
 make install-coverage

.ci/build.sh

@@ -9,15 +9,15 @@ Please send a pull request to the `main` branch. Please include [documentation](
 - Fork the Pillow repository.
 - Create a branch from `main`.
 - Develop bug fixes, features, tests, etc.
-- Run the test suite. You can enable GitHub Actions (https://github.com/MY-USERNAME/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/projects/new) on your repo to catch test failures prior to the pull request, and [Codecov](https://codecov.io/gh) to see if the changed code is covered by tests.
+- Run the test suite. You can enable GitHub Actions (https://github.com/MY-USERNAME/Pillow/actions) on your repo to catch test failures prior to the pull request, and [Codecov](https://codecov.io/gh) to see if the changed code is covered by tests.
 - Create a pull request to pull the changes from your branch to the Pillow `main`.
 
 ### Guidelines
 
 - Separate code commits from reformatting commits.
 - Provide tests for any newly added code.
 - Follow PEP 8.
-- When committing only documentation changes please include `[ci skip]` in the commit message to avoid running tests on AppVeyor.
+- When committing only documentation changes please include `[ci skip]` in the commit message to avoid running extra tests.
 - Include [release notes](https://github.com/python-pillow/Pillow/tree/main/docs/releasenotes) as needed or appropriate with your bug fixes, feature additions and tests.
 
 ## Reporting Issues

.github/CONTRIBUTING.md

@@ -9,7 +9,6 @@ pull_request_rules:
  - status-success=Windows Test Successful
  - status-success=MinGW
  - status-success=Cygwin Test Successful
- - status-success=continuous-integration/appveyor/pr
  actions:
  merge:
  method: merge

.github/mergify.yml

@@ -10,15 +10,11 @@ brew install \
  ghostscript \
  jpeg-turbo \
  libimagequant \
+ libraqm \
  libtiff \
  little-cms2 \
  openjpeg \
  webp
-if [[ "$ImageOS" == "macos13" ]]; then
- brew install --ignore-dependencies libraqm
-else
- brew install libraqm
-fi
 export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig"
 
 python3 -m pip install coverage

.github/workflows/macos-install.sh

@@ -52,7 +52,7 @@ jobs:
  persist-credentials: false
 
  - name: Install Cygwin
- uses: cygwin/cygwin-install-action@v4
+ uses: cygwin/cygwin-install-action@v5
  with:
  packages: >
  gcc-g++

.github/workflows/test-cygwin.yml

@@ -29,16 +29,12 @@ concurrency:
 jobs:
  build:
 
- runs-on: ubuntu-latest
+ runs-on: ${{ matrix.os }}
  strategy:
  fail-fast: false
  matrix:
+ os: ["ubuntu-latest"]
  docker: [
- # Run slower jobs first to give them a headstart and reduce waiting time
- ubuntu-22.04-jammy-arm64v8,
- ubuntu-24.04-noble-ppc64le,
- ubuntu-24.04-noble-s390x,
- # Then run the remainder
  alpine,
  amazon-2-amd64,
  amazon-2023-amd64,
@@ -55,12 +51,17 @@ jobs:
  ]
  dockerTag: [main]
  include:
- - docker: "ubuntu-22.04-jammy-arm64v8"
- qemu-arch: "aarch64"
  - docker: "ubuntu-24.04-noble-ppc64le"
+ os: "ubuntu-22.04"
  qemu-arch: "ppc64le"
+ dockerTag: main
  - docker: "ubuntu-24.04-noble-s390x"
+ os: "ubuntu-22.04"
  qemu-arch: "s390x"
+ dockerTag: main
+ - docker: "ubuntu-24.04-noble-arm64v8"
+ os: "ubuntu-24.04-arm"
+ dockerTag: main
 
  name: ${{ matrix.docker }}
 
@@ -90,15 +91,15 @@ jobs:
 
  - name: After success
  run: |
- PATH="$PATH:~/.local/bin"
  docker start pillow_container
+ sudo docker cp pillow_container:/Pillow /Pillow
+ sudo chown -R runner /Pillow
  pil_path=`docker exec pillow_container /vpy3/bin/python -c 'import os, PIL;print(os.path.realpath(os.path.dirname(PIL.__file__)))'`
  docker stop pillow_container
  sudo mkdir -p $pil_path
  sudo cp src/PIL/*.py $pil_path
+ cd /Pillow
  .ci/after_success.sh
- env:
- MATRIX_DOCKER: ${{ matrix.docker }}
 
  - name: Upload coverage
  uses: codecov/codecov-action@v5

.github/workflows/test-docker.yml

@@ -60,15 +60,14 @@ jobs:
  mingw-w64-x86_64-gcc \
  mingw-w64-x86_64-ghostscript \
  mingw-w64-x86_64-lcms2 \
- mingw-w64-x86_64-libimagequant \
  mingw-w64-x86_64-libjpeg-turbo \
  mingw-w64-x86_64-libraqm \
  mingw-w64-x86_64-libtiff \
  mingw-w64-x86_64-libwebp \
  mingw-w64-x86_64-openjpeg2 \
- mingw-w64-x86_64-python3-numpy \
- mingw-w64-x86_64-python3-olefile \
- mingw-w64-x86_64-python3-pip \
+ mingw-w64-x86_64-python-numpy \
+ mingw-w64-x86_64-python-olefile \
+ mingw-w64-x86_64-python-pip \
  mingw-w64-x86_64-python-pytest \
  mingw-w64-x86_64-python-pytest-cov \
  mingw-w64-x86_64-python-pytest-timeout \

.github/workflows/test-mingw.yml

@@ -31,15 +31,20 @@ env:
 
 jobs:
  build:
- runs-on: windows-latest
+ runs-on: ${{ matrix.os }}
  strategy:
  fail-fast: false
  matrix:
- python-version: ["pypy3.10", "3.9", "3.10", "3.11", "3.12", "3.13"]
+ python-version: ["pypy3.10", "3.10", "3.11", "3.12", "3.13", "3.14"]
+ architecture: ["x64"]
+ os: ["windows-latest"]
+ include:
+ # Test the oldest Python on 32-bit
+ - { python-version: "3.9", architecture: "x86", os: "windows-2019" }
 
  timeout-minutes: 30
 
- name: Python ${{ matrix.python-version }}
+ name: Python ${{ matrix.python-version }} (${{ matrix.architecture }})
 
  steps:
  - name: Checkout Pillow
@@ -67,6 +72,7 @@ jobs:
  with:
  python-version: ${{ matrix.python-version }}
  allow-prereleases: true
+ architecture: ${{ matrix.architecture }}
  cache: pip
  cache-dependency-path: ".github/workflows/test-windows.yml"
 
@@ -78,7 +84,7 @@ jobs:
  python3 -m pip install --upgrade pip
 
  - name: Install CPython dependencies
- if: "!contains(matrix.python-version, 'pypy')"
+ if: "!contains(matrix.python-version, 'pypy') && matrix.architecture != 'x86'"
  run: |
  python3 -m pip install PyQt6