Merge branch 'main' into jpeg-app-segments

Author: radarhere

.ci/install.sh

@@ -13,57 +13,48 @@ aptget_update()
         return 1
     fi
 }
-if [[ $(uname) != CYGWIN* ]]; then
-    aptget_update || aptget_update retry || aptget_update retry
-fi
+aptget_update || aptget_update retry || aptget_update retry
 
 set -e
 
-if [[ $(uname) != CYGWIN* ]]; then
-    sudo apt-get -qq install libfreetype6-dev liblcms2-dev libtiff-dev python3-tk\
-                             ghostscript libjpeg-turbo8-dev libopenjp2-7-dev\
-                             cmake meson imagemagick libharfbuzz-dev libfribidi-dev\
-                             sway wl-clipboard libopenblas-dev
-fi
+sudo apt-get -qq install libfreetype6-dev liblcms2-dev libtiff-dev python3-tk\
+                         ghostscript libjpeg-turbo8-dev libopenjp2-7-dev\
+                         cmake meson imagemagick libharfbuzz-dev libfribidi-dev\
+                         sway wl-clipboard libopenblas-dev nasm
 
 python3 -m pip install --upgrade pip
 python3 -m pip install --upgrade wheel
 python3 -m pip install coverage
 python3 -m pip install defusedxml
 python3 -m pip install ipython
+python3 -m pip install numpy
 python3 -m pip install olefile
 python3 -m pip install -U pytest
 python3 -m pip install -U pytest-cov
 python3 -m pip install -U pytest-timeout
 python3 -m pip install pyroma
+# optional test dependency, only install if there's a binary package.
+# fails on beta 3.14 and PyPy
+python3 -m pip install --only-binary=:all: pyarrow || true
+
+# PyQt6 doesn't support PyPy3
+if [[ $GHA_PYTHON_VERSION == 3.* ]]; then
+    sudo apt-get -qq install libegl1 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxkbcommon-x11-0
+    # TODO Update condition when pyqt6 supports free-threading
+    if ! [[ "$PYTHON_GIL" == "0" ]]; then python3 -m pip install pyqt6 ; fi
+fi
 
-if [[ $(uname) != CYGWIN* ]]; then
-    python3 -m pip install numpy
-
-    # PyQt6 doesn't support PyPy3
-    if [[ $GHA_PYTHON_VERSION == 3.* ]]; then
-        sudo apt-get -qq install libegl1 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxkbcommon-x11-0
-        # TODO Update condition when pyqt6 supports free-threading
-        if ! [[ "$PYTHON_GIL" == "0" ]]; then python3 -m pip install pyqt6 ; fi
-    fi
-
-    # Pyroma uses non-isolated build and fails with old setuptools
-    if [[ $GHA_PYTHON_VERSION == 3.9 ]]; then
-        # To match pyproject.toml
-        python3 -m pip install "setuptools>=67.8"
-    fi
+# webp
+pushd depends && ./install_webp.sh && popd
 
-    # webp
-    pushd depends && ./install_webp.sh && popd
+# libimagequant
+pushd depends && ./install_imagequant.sh && popd
 
-    # libimagequant
-    pushd depends && ./install_imagequant.sh && popd
+# raqm
+pushd depends && sudo ./install_raqm.sh && popd
 
-    # raqm
-    pushd depends && ./install_raqm.sh && popd
+# libavif
+pushd depends && sudo ./install_libavif.sh && popd
 
-    # extra test images
-    pushd depends && ./install_extra_test_images.sh && popd
-else
-    cd depends && ./install_extra_test_images.sh && cd ..
-fi
+# extra test images
+pushd depends && ./install_extra_test_images.sh && popd

.ci/requirements-cibw.txt

@@ -1 +1 @@
-cibuildwheel==2.23.1
+cibuildwheel==3.2.1

.ci/requirements-mypy.txt

@@ -1,9 +1,13 @@
-mypy==1.15.0
+mypy==1.18.2
+arro3-compute
+arro3-core
 IceSpringPySideStubs-PyQt6
 IceSpringPySideStubs-PySide6
 ipython
 numpy
 packaging
+pyarrow-stubs
+pybind11
 pytest
 sphinx
 types-atheris

.ci/test.cmd

@@ -1,3 +1,3 @@
 python.exe -c "from PIL import Image"
 IF ERRORLEVEL 1 EXIT /B
-python.exe -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests
+python.exe -bb -m pytest -vv -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests

.ci/test.sh

@@ -4,4 +4,4 @@ set -e
 
 python3 -c "from PIL import Image"
 
-python3 -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests $REVERSE
+python3 -bb -m pytest -vv -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests $REVERSE

.clang-format

@@ -1,5 +1,6 @@
 # A clang-format style that approximates Python's PEP 7
 # Useful for IDE integration
+Language: C
 BasedOnStyle: Google
 AlwaysBreakAfterReturnType: All
 AllowShortIfStatementsOnASingleLine: false
@@ -11,7 +12,26 @@ ColumnLimit: 88
 DerivePointerAlignment: false
 IndentGotoLabels: false
 IndentWidth: 4
+PointerAlignment: Right
+ReflowComments: true
+SortIncludes: false
+SpaceBeforeParens: ControlStatements
+SpacesInParentheses: false
+TabWidth: 4
+UseTab: Never
+---
 Language: Cpp
+BasedOnStyle: Google
+AlwaysBreakAfterReturnType: All
+AllowShortIfStatementsOnASingleLine: false
+AlignAfterOpenBracket: BlockIndent
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBraces: Attach
+ColumnLimit: 88
+DerivePointerAlignment: false
+IndentGotoLabels: false
+IndentWidth: 4
 PointerAlignment: Right
 ReflowComments: true
 SortIncludes: false

.coveragerc

@@ -18,6 +18,5 @@ exclude_also =
 
 [run]
 omit =
-    Tests/32bit_segfault_check.py
-    Tests/check_*.py
+    checks/*.py
     Tests/createfontdatachunk.py

.github/ISSUE_TEMPLATE/RELEASE.md

@@ -0,0 +1,46 @@
+---
+name: "Maintainers only: Release"
+about: For maintainers to schedule a quarterly release
+labels: Release
+---
+
+## Main release
+
+Released quarterly on January 2nd, April 1st, July 1st and October 15th.
+
+* [ ] Open a release ticket e.g. https://github.com/python-pillow/Pillow/issues/3154
+* [ ] Develop and prepare release in `main` branch.
+  * [ ] Add release notes e.g. https://github.com/python-pillow/Pillow/pull/8885
+* [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions) to confirm passing tests in `main` branch.
+* [ ] Check that all the wheel builds pass the tests in the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml) jobs by manually triggering them.
+* [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/), update version identifier in `src/PIL/_version.py`
+* [ ] Run pre-release check via `make release-test` in a freshly cloned repo.
+* [ ] Create branch and tag for release e.g.:
+  ```bash
+  git branch [[MAJOR.MINOR]].x
+  git tag [[MAJOR.MINOR]].0
+  git push --tags
+  ```
+* [ ] Check the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml) has passed, including the "Upload release to PyPI" job. This will have been triggered by the new tag.
+* [ ] Publish the [release on GitHub](https://github.com/python-pillow/Pillow/releases).
+* [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/), increment and append `.dev0` to version identifier in `src/PIL/_version.py` and then:
+  ```bash
+  git push --all
+   ```
+
+## Publicize release
+
+* [ ] Announce release availability via [Mastodon](https://fosstodon.org/@pillow) e.g. https://fosstodon.org/@pillow/110639450470725321
+
+## Documentation
+
+* [ ] Make sure the [default version for Read the Docs](https://pillow.readthedocs.io/en/stable/) is up-to-date with the release changes
+
+## Docker images
+
+* [ ] Update Pillow in the Docker Images repository
+  ```bash
+  git clone https://github.com/python-pillow/docker-images
+  cd docker-images
+  ./update-pillow-tag.sh [[release tag]]
+  ```

.github/mergify.yml

@@ -8,7 +8,6 @@ pull_request_rules:
       - status-success=Docker Test Successful
       - status-success=Windows Test Successful
       - status-success=MinGW
-      - status-success=Cygwin Test Successful
     actions:
       merge:
         method: merge

.github/workflows/docs.yml

@@ -32,12 +32,12 @@ jobs:
     name: Docs
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         persist-credentials: false
 
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: "3.x"
         cache: pip