Merge branch 'main' into context_manager

python-pillow · Jan 20, 2025 · 469f91e · 469f91e
2 parents 0b6418d + 58dd4a7
commit 469f91e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml
@@ -29,13 +29,13 @@ 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
@@ -55,12 +55,13 @@ jobs:
         ]
         dockerTag: [main]
         include:
-          - docker: "ubuntu-22.04-jammy-arm64v8"
-            qemu-arch: "aarch64"
           - docker: "ubuntu-24.04-noble-ppc64le"
             qemu-arch: "ppc64le"
           - docker: "ubuntu-24.04-noble-s390x"
             qemu-arch: "s390x"
+          - docker: "ubuntu-24.04-noble-arm64v8"
+            os: "ubuntu-24.04-arm"
+            dockerTag: main
 
     name: ${{ matrix.docker }}
 

diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst
@@ -44,11 +44,9 @@ These platforms are built and tested for every change.
 +----------------------------------+----------------------------+---------------------+
 | Ubuntu Linux 22.04 LTS (Jammy)   | 3.9, 3.10, 3.11,           | x86-64              |
 |                                  | 3.12, 3.13, PyPy3          |                     |
-|                                  +----------------------------+---------------------+
-|                                  | 3.10                       | arm64v8             |
 +----------------------------------+----------------------------+---------------------+
-| Ubuntu Linux 24.04 LTS (Noble)   | 3.12                       | x86-64, ppc64le,    |
-|                                  |                            | s390x               |
+| Ubuntu Linux 24.04 LTS (Noble)   | 3.12                       | x86-64, arm64v8,    |
+|                                  |                            | ppc64le, s390x      |
 +----------------------------------+----------------------------+---------------------+
 | Windows Server 2019              | 3.9                        | x86                 |
 +----------------------------------+----------------------------+---------------------+

diff --git a/docs/reference/features.rst b/docs/reference/features.rst
@@ -54,6 +54,7 @@ Feature version numbers are available only where stated.
 Support for the following features can be checked:
 
 * ``libjpeg_turbo``: (compile time) Whether Pillow was compiled against the libjpeg-turbo version of libjpeg. Compile-time version number is available.
+* ``mozjpeg``: (compile time) Whether Pillow was compiled against the MozJPEG version of libjpeg. Compile-time version number is available.
 * ``zlib_ng``: (compile time) Whether Pillow was compiled against the zlib-ng version of zlib. Compile-time version number is available.
 * ``raqm``: Raqm library, required for ``ImageFont.Layout.RAQM`` in :py:func:`PIL.ImageFont.truetype`. Run-time version number is available for Raqm 0.7.0 or newer.
 * ``libimagequant``: (compile time) ImageQuant quantization support in :py:func:`PIL.Image.Image.quantize`. Run-time version number is available.

diff --git a/docs/releasenotes/11.2.0.rst b/docs/releasenotes/11.2.0.rst
@@ -44,10 +44,15 @@ TODO
 API Additions
 =============
 
-TODO
-^^^^
+Check for MozJPEG
+^^^^^^^^^^^^^^^^^
 
-TODO
+You can check if Pillow has been built against the MozJPEG version of the
+libjpeg library, and what version of MozJPEG is being used::
+
+    from PIL import features
+    features.check_feature("mozjpeg")  # True or False
+    features.version_feature("mozjpeg")  # "4.1.1" for example, or None
 
 Other Changes
 =============

diff --git a/src/PIL/Image.py b/src/PIL/Image.py
@@ -608,8 +608,6 @@ def __exit__(self, *args: object) -> None:
 
     def close(self) -> None:
         """
-        Closes the file pointer, if possible.
-
         This operation will destroy the image core and release its memory.
         The image data will be unusable afterward.