From f9ff9b34605523c739f6839725cec63f93dcd871 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 21 Aug 2026 14:24:33 +0900 Subject: [PATCH] Add mixed-line-ending to prek and convert to LF Co-authored-by: Andrew Murray --- .github/embed-sbom.py | 12 ++++++------ .pre-commit-config.yaml | 3 +++ docs/installation/newer-versions.csv | 22 +++++++++++----------- docs/installation/older-versions.csv | 14 +++++++------- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/.github/embed-sbom.py b/.github/embed-sbom.py index 64c4b4b124d..88c841b8ae9 100644 --- a/.github/embed-sbom.py +++ b/.github/embed-sbom.py @@ -47,12 +47,12 @@ def embed(wheel: Path, sbom: Path) -> None: lines.append(record_entry(sbom_path, sbom_bytes)) contents[record_name] = b"\n".join(lines) + b"\n" - with zipfile.ZipFile(wheel, "w", zipfile.ZIP_DEFLATED) as zf: - # Re-use each original ZipInfo to preserve timestamps, mode bits and - # compression; only RECORD's contents change - for info in infos: - zf.writestr(info, contents[info.filename]) - zf.writestr(sbom_path, sbom_bytes) + with zipfile.ZipFile(wheel, "w", zipfile.ZIP_DEFLATED) as zf: + # Re-use each original ZipInfo to preserve timestamps, mode bits and + # compression; only RECORD's contents change + for info in infos: + zf.writestr(info, contents[info.filename]) + zf.writestr(sbom_path, sbom_bytes) print(f"Embedded {sbom.name} in {wheel.name}") diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index add5609f5ef..772746904e1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -50,6 +50,9 @@ repos: exclude: ^Tests/images/|\.patch$ - id: file-contents-sorter files: .github/workflows/Brewfile + - id: mixed-line-ending + args: [--fix=lf] + exclude: ^Tests/images/ - id: trailing-whitespace exclude: ^\.github/.*TEMPLATE|^Tests/(fonts|images)/|\.patch$ diff --git a/docs/installation/newer-versions.csv b/docs/installation/newer-versions.csv index 64438bb92fc..ee4de7770d5 100644 --- a/docs/installation/newer-versions.csv +++ b/docs/installation/newer-versions.csv @@ -1,11 +1,11 @@ -Python,3.15,3.14,3.13,3.12,3.11,3.10,3.9,3.8,3.7,3.6,3.5 -Pillow 13,Yes,Yes,Yes,Yes,Yes,,,,,, -Pillow 12,,Yes,Yes,Yes,Yes,Yes,,,,, -Pillow 11,,,Yes,Yes,Yes,Yes,Yes,,,, -Pillow 10.1 - 10.4,,,,Yes,Yes,Yes,Yes,Yes,,, -Pillow 10.0,,,,,Yes,Yes,Yes,Yes,,, -Pillow 9.3 - 9.5,,,,,Yes,Yes,Yes,Yes,Yes,, -Pillow 9.0 - 9.2,,,,,,Yes,Yes,Yes,Yes,, -Pillow 8.3.2 - 8.4,,,,,,Yes,Yes,Yes,Yes,Yes, -Pillow 8.0 - 8.3.1,,,,,,,Yes,Yes,Yes,Yes, -Pillow 7.0 - 7.2,,,,,,,,Yes,Yes,Yes,Yes +Python,3.15,3.14,3.13,3.12,3.11,3.10,3.9,3.8,3.7,3.6,3.5 +Pillow 13,Yes,Yes,Yes,Yes,Yes,,,,,, +Pillow 12,,Yes,Yes,Yes,Yes,Yes,,,,, +Pillow 11,,,Yes,Yes,Yes,Yes,Yes,,,, +Pillow 10.1 - 10.4,,,,Yes,Yes,Yes,Yes,Yes,,, +Pillow 10.0,,,,,Yes,Yes,Yes,Yes,,, +Pillow 9.3 - 9.5,,,,,Yes,Yes,Yes,Yes,Yes,, +Pillow 9.0 - 9.2,,,,,,Yes,Yes,Yes,Yes,, +Pillow 8.3.2 - 8.4,,,,,,Yes,Yes,Yes,Yes,Yes, +Pillow 8.0 - 8.3.1,,,,,,,Yes,Yes,Yes,Yes, +Pillow 7.0 - 7.2,,,,,,,,Yes,Yes,Yes,Yes diff --git a/docs/installation/older-versions.csv b/docs/installation/older-versions.csv index aa696bc18da..ea0a454ef44 100644 --- a/docs/installation/older-versions.csv +++ b/docs/installation/older-versions.csv @@ -1,8 +1,8 @@ -Python,3.8,3.7,3.6,3.5,3.4,3.3,3.2,2.7,2.6,2.5,2.4 -Pillow 6.2.1 - 6.2.2,Yes,Yes,Yes,Yes,,,,Yes,,, -Pillow 6.0 - 6.2.0,,Yes,Yes,Yes,,,,Yes,,, -Pillow 5.2 - 5.4,,Yes,Yes,Yes,Yes,,,Yes,,, -Pillow 5.0 - 5.1,,,Yes,Yes,Yes,,,Yes,,, -Pillow 4,,,Yes,Yes,Yes,Yes,,Yes,,, -Pillow 2 - 3,,,,Yes,Yes,Yes,Yes,Yes,Yes,, +Python,3.8,3.7,3.6,3.5,3.4,3.3,3.2,2.7,2.6,2.5,2.4 +Pillow 6.2.1 - 6.2.2,Yes,Yes,Yes,Yes,,,,Yes,,, +Pillow 6.0 - 6.2.0,,Yes,Yes,Yes,,,,Yes,,, +Pillow 5.2 - 5.4,,Yes,Yes,Yes,Yes,,,Yes,,, +Pillow 5.0 - 5.1,,,Yes,Yes,Yes,,,Yes,,, +Pillow 4,,,Yes,Yes,Yes,Yes,,Yes,,, +Pillow 2 - 3,,,,Yes,Yes,Yes,Yes,Yes,Yes,, Pillow < 2,,,,,,,,Yes,Yes,Yes,Yes