Merge remote-tracking branch 'upstream/main' into rm-3.8

hugovk · Jul 2, 2024 · d7b0aaa · d7b0aaa
2 parents 8e94aa1 + 8c2a823
commit d7b0aaa
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 59 deletions.
diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml
@@ -44,7 +44,6 @@ jobs:
           amazon-2023-amd64,
           arch,
           centos-stream-9-amd64,
-          debian-11-bullseye-amd64,
           debian-12-bookworm-x86,
           debian-12-bookworm-amd64,
           fedora-39-amd64,

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.7
+    rev: v0.5.0
     hooks:
       - id: ruff
         args: [--exit-non-zero-on-fix]
@@ -11,7 +11,7 @@ repos:
       - id: black
 
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.8
+    rev: 1.7.9
     hooks:
     - id: bandit
       args: [--severity-level=high]
@@ -24,7 +24,7 @@ repos:
         exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.gd$|\.opt$)
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v18.1.5
+    rev: v18.1.8
     hooks:
       - id: clang-format
         types: [c]
@@ -50,7 +50,7 @@ repos:
         exclude: ^.github/.*TEMPLATE|^Tests/(fonts|images)/
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.28.4
+    rev: 0.28.6
     hooks:
       - id: check-github-workflows
       - id: check-readthedocs
@@ -62,7 +62,7 @@ repos:
       - id: sphinx-lint
 
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: 1.8.0
+    rev: 2.1.3
     hooks:
       - id: pyproject-fmt
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -338,7 +338,7 @@
 # https://www.sphinx-doc.org/en/master/usage/extensions/extlinks.html
 _repo = "https://github.com/python-pillow/Pillow/"
 extlinks = {
-    "cve": ("https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-%s", "CVE-%s"),
+    "cve": ("https://www.cve.org/CVERecord?id=CVE-%s", "CVE-%s"),
     "cwe": ("https://cwe.mitre.org/data/definitions/%s.html", "CWE-%s"),
     "issue": (_repo + "issues/%s", "#%s"),
     "pr": (_repo + "pull/%s", "#%s"),

diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst
@@ -27,8 +27,6 @@ These platforms are built and tested for every change.
 +----------------------------------+----------------------------+---------------------+
 | CentOS Stream 9                  | 3.9                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
-| Debian 11 Bullseye               | 3.9                        | x86-64              |
-+----------------------------------+----------------------------+---------------------+
 | Debian 12 Bookworm               | 3.11                       | x86, x86-64         |
 +----------------------------------+----------------------------+---------------------+
 | Fedora 39                        | 3.12                       | x86-64              |

diff --git a/pyproject.toml b/pyproject.toml
@@ -14,8 +14,10 @@ readme = "README.md"
 keywords = [
   "Imaging",
 ]
-license = {text = "HPND"}
-authors = [{name = "Jeffrey A. Clark", email = "aclark@aclark.net"}]
+license = { text = "HPND" }
+authors = [
+  { name = "Jeffrey A. Clark", email = "aclark@aclark.net" },
+]
 requires-python = ">=3.9"
 classifiers = [
   "Development Status :: 6 - Mature",
@@ -37,22 +39,21 @@ classifiers = [
 dynamic = [
   "version",
 ]
-[project.optional-dependencies]
-docs = [
+optional-dependencies.docs = [
   "furo",
   "olefile",
   "sphinx>=7.3",
   "sphinx-copybutton",
   "sphinx-inline-tabs",
   "sphinxext-opengraph",
 ]
-fpx = [
+optional-dependencies.fpx = [
   "olefile",
 ]
-mic = [
+optional-dependencies.mic = [
   "olefile",
 ]
-tests = [
+optional-dependencies.tests = [
   "check-manifest",
   "coverage",
   "defusedxml",
@@ -64,28 +65,29 @@ tests = [
   "pytest-cov",
   "pytest-timeout",
 ]
-typing = [
-  'typing-extensions; python_version < "3.10"',
+optional-dependencies.typing = [
+  "typing-extensions; python_version<'3.10'",
 ]
-xmp = [
+optional-dependencies.xmp = [
   "defusedxml",
 ]
-[project.urls]
-Changelog = "https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst"
-Documentation = "https://pillow.readthedocs.io"
-Funding = "https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=pypi"
-Homepage = "https://python-pillow.org"
-Mastodon = "https://fosstodon.org/@pillow"
-"Release notes" = "https://pillow.readthedocs.io/en/stable/releasenotes/index.html"
-Source = "https://github.com/python-pillow/Pillow"
+urls.Changelog = "https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst"
+urls.Documentation = "https://pillow.readthedocs.io"
+urls.Funding = "https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=pypi"
+urls.Homepage = "https://python-pillow.org"
+urls.Mastodon = "https://fosstodon.org/@pillow"
+urls."Release notes" = "https://pillow.readthedocs.io/en/stable/releasenotes/index.html"
+urls.Source = "https://github.com/python-pillow/Pillow"
 
 [tool.setuptools]
-packages = ["PIL"]
+packages = [
+  "PIL",
+]
 include-package-data = true
-package-dir = {"" = "src"}
+package-dir = { "" = "src" }
 
 [tool.setuptools.dynamic]
-version = {attr = "PIL.__version__"}
+version = { attr = "PIL.__version__" }
 
 [tool.cibuildwheel]
 before-all = ".github/workflows/wheels-dependencies.sh"
@@ -97,42 +99,47 @@ test-extras = "tests"
 [tool.ruff]
 fix = true
 
-[tool.ruff.lint]
-select = [
-  "C4", # flake8-comprehensions
-  "E", # pycodestyle errors
-  "EM", # flake8-errmsg
-  "F", # pyflakes errors
-  "I", # isort
-  "ISC", # flake8-implicit-str-concat
-  "LOG", # flake8-logging
-  "PGH", # pygrep-hooks
-  "PYI", # flake8-pyi
+lint.select = [
+  "C4",     # flake8-comprehensions
+  "E",      # pycodestyle errors
+  "EM",     # flake8-errmsg
+  "F",      # pyflakes errors
+  "I",      # isort
+  "ISC",    # flake8-implicit-str-concat
+  "LOG",    # flake8-logging
+  "PGH",    # pygrep-hooks
+  "PYI",    # flake8-pyi
   "RUF100", # unused noqa (yesqa)
-  "UP", # pyupgrade
-  "W", # pycodestyle warnings
-  "YTT", # flake8-2020
-]
-ignore = [
-  "E203", # Whitespace before ':'
-  "E221", # Multiple spaces before operator
-  "E226", # Missing whitespace around arithmetic operator
-  "E241", # Multiple spaces after ','
+  "UP",     # pyupgrade
+  "W",      # pycodestyle warnings
+  "YTT",    # flake8-2020
+]
+lint.ignore = [
+  "E203",   # Whitespace before ':'
+  "E221",   # Multiple spaces before operator
+  "E226",   # Missing whitespace around arithmetic operator
+  "E241",   # Multiple spaces after ','
   "PYI026", # flake8-pyi: typing.TypeAlias added in Python 3.10
   "PYI034", # flake8-pyi: typing.Self added in Python 3.11
 ]
-
-[tool.ruff.lint.per-file-ignores]
-"Tests/oss-fuzz/fuzz_font.py" = ["I002"]
-"Tests/oss-fuzz/fuzz_pillow.py" = ["I002"]
-
-[tool.ruff.lint.isort]
-known-first-party = ["PIL"]
-required-imports = ["from __future__ import annotations"]
+lint.per-file-ignores."Tests/oss-fuzz/fuzz_font.py" = [
+  "I002",
+]
+lint.per-file-ignores."Tests/oss-fuzz/fuzz_pillow.py" = [
+  "I002",
+]
+lint.isort.known-first-party = [
+  "PIL",
+]
+lint.isort.required-imports = [
+  "from __future__ import annotations",
+]
 
 [tool.pytest.ini_options]
 addopts = "-ra --color=yes"
-testpaths = ["Tests"]
+testpaths = [
+  "Tests",
+]
 
 [tool.mypy]
 python_version = "3.9"