Merge branch 'main' into exif_hide_offsets

.editorconfig

@@ -13,6 +13,10 @@ indent_style = space
 
 trim_trailing_whitespace = true
 
+[*.rst]
+# Four-space indentation
+indent_size = 4
+
 [*.yml]
 # Two-space indentation
 indent_size = 2

.github/workflows/stale.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
     - name: "Check issues"
-      uses: actions/stale@v6
+      uses: actions/stale@v7
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         only-labels: "Awaiting OP Action"

.github/workflows/test-cygwin.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-minor-version: [7, 8, 9]
+        python-minor-version: [8, 9]
 
     timeout-minutes: 40
 
@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install Cygwin
-        uses: cygwin/cygwin-install-action@v2
+        uses: cygwin/cygwin-install-action@v3
         with:
           platform: x86_64
           packages: >
@@ -48,7 +48,7 @@ jobs:
             qt5-devel-tools subversion xorg-server-extra zlib-devel
 
       - name: Add Lapack to PATH
-        uses: egor-tensin/cleanup-path@v2
+        uses: egor-tensin/cleanup-path@v3
         with:
           dirs: 'C:\cygwin\bin;C:\cygwin\lib\lapack'
 

.github/workflows/test-windows.yml

@@ -19,9 +19,9 @@ jobs:
         architecture: ["x86", "x64"]
         include:
           # PyPy 7.3.4+ only ships 64-bit binaries for Windows
-          - python-version: "pypy-3.7"
+          - python-version: "pypy3.8"
             architecture: "x64"
-          - python-version: "pypy-3.8"
+          - python-version: "pypy3.9"
             architecture: "x64"
 
     timeout-minutes: 30
@@ -141,7 +141,7 @@ jobs:
       if: steps.build-cache.outputs.cache-hit != 'true'
       run: "& winbuild\\build\\build_dep_fribidi.cmd"
 
-    # trim ~150MB x 9
+    # trim ~150MB for each job
     - name: Optimize build cache
       if: steps.build-cache.outputs.cache-hit != 'true'
       run: rmdir /S /Q winbuild\build\src

.github/workflows/test.yml

@@ -20,8 +20,8 @@ jobs:
           "ubuntu-latest",
         ]
         python-version: [
-          "pypy-3.8",
-          "pypy-3.7",
+          "pypy3.9",
+          "pypy3.8",
           "3.11",
           "3.10",
           "3.9",

.pre-commit-config.yaml

@@ -1,18 +1,25 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 22.10.0
+    rev: 22.12.0
     hooks:
       - id: black
-        args: ["--target-version", "py37"]
+        args: [--target-version=py37]
         # Only .py files, until https://github.com/psf/black/issues/402 resolved
         files: \.py$
         types: []
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.11.1
     hooks:
       - id: isort
 
+  - repo: https://github.com/PyCQA/bandit
+    rev: 1.7.4
+    hooks:
+    - id: bandit
+      args: [--severity-level=high]
+      files: ^src/
+
   - repo: https://github.com/asottile/yesqa
     rev: v1.4.0
     hooks:
@@ -25,7 +32,7 @@ repos:
         exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.opt$)
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+    rev: 6.0.0
     hooks:
       - id: flake8
         additional_dependencies: [flake8-2020, flake8-implicit-str-concat]
@@ -37,7 +44,7 @@ repos:
       - id: rst-backticks
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: check-merge-conflict
       - id: check-json
@@ -48,5 +55,10 @@ repos:
     hooks:
       - id: sphinx-lint
 
+  - repo: https://github.com/tox-dev/tox-ini-fmt
+    rev: 0.5.2
+    hooks:
+      - id: tox-ini-fmt
+
 ci:
   autoupdate_schedule: monthly

CHANGES.rst

@@ -5,6 +5,27 @@ Changelog (Pillow)
 9.4.0 (unreleased)
 ------------------
 
+- Ignore non-opaque WebP background when saving as GIF #6792
+  [radarhere]
+
+- Only set tile in ImageFile __setstate__ #6793
+  [radarhere]
+
+- When reading BLP, do not trust JPEG decoder to determine image is CMYK #6767
+  [radarhere]
+
+- Added IFD enum to ExifTags #6748
+  [radarhere]
+
+- Fixed bug combining GIF frame durations #6779
+  [radarhere]
+
+- Support saving JPEG comments #6774
+  [smason, radarhere]
+
+- Added getxmp() to WebPImagePlugin #6758
+  [radarhere]
+
 - Added "exact" option when saving WebP #6747
   [ashafaei, radarhere]
 

MANIFEST.in

@@ -1,7 +1,6 @@
 include *.c
 include *.h
 include *.in
-include *.lock
 include *.md
 include *.py
 include *.rst
@@ -10,7 +9,6 @@ include *.txt
 include *.yaml
 include LICENSE
 include Makefile
-include Pipfile
 include tox.ini
 graft Tests
 graft src