Skip to content

Commit 6a02c11

Browse files
authored
Merge branch 'main' into feat/riscv64-wheels
2 parents 40aaf9f + 701d404 commit 6a02c11

60 files changed

Lines changed: 369 additions & 269 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ci/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ python3 -m pip install --only-binary=:all: pyarrow || true
3939
# PyQt6 doesn't support PyPy3
4040
if [[ $GHA_PYTHON_VERSION == 3.* ]]; then
4141
sudo apt-get -qq install libegl1 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxkbcommon-x11-0
42-
# TODO Update condition when pyqt6 supports free-threading
43-
if ! [[ "$PYTHON_GIL" == "0" ]]; then python3 -m pip install pyqt6 ; fi
42+
# pyqt6 doesn't yet support free-threading; only install if a wheel is available
43+
python3 -m pip install --only-binary=:all: pyqt6 || true
4444
fi
4545

4646
# webp

.ci/requirements-cibw.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cibuildwheel==3.4.1
1+
cibuildwheel==4.0.0

.ci/requirements-sbom.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
check-jsonschema==0.37.1
1+
check-jsonschema==0.37.2

.github/dependencies.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"fribidi": "1.0.16",
66
"harfbuzz": "14.2.0",
77
"jpegturbo": "3.1.4.1",
8-
"lcms2": "2.19",
9-
"libavif": "1.4.1",
8+
"lcms2": "2.19.1",
9+
"libavif": "1.4.2",
1010
"libimagequant": "4.4.1",
1111
"libpng": "1.6.58",
1212
"libwebp": "1.6.0",

.github/generate-sbom.py

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,45 @@ def generate(version: str) -> dict:
356356
"scope": "optional",
357357
"description": "TIFF codec (optional).",
358358
"licenses": [{"license": {"id": "libtiff"}}],
359+
"pedigree": {
360+
"ancestors": [
361+
{
362+
"bom-ref": "pkg:generic/libtiff@4.7.1#upstream",
363+
"type": "library",
364+
"name": "libtiff",
365+
"version": "4.7.1",
366+
"purl": "pkg:generic/libtiff@4.7.1",
367+
"externalReferences": [
368+
{
369+
"type": "distribution",
370+
"url": "https://gitlab.com/libtiff/libtiff/-/tags/v4.7.1",
371+
}
372+
],
373+
}
374+
],
375+
"patches": [
376+
{
377+
"type": "cherry-pick",
378+
"diff": {
379+
"text": {
380+
# apply https://gitlab.com/libtiff/libtiff/-/commit/782a11d6
381+
"content": base64.b64encode(
382+
(
383+
Path(__file__).parent.parent
384+
/ "patches"
385+
/ "tiff-4.7.1.tar.gz.patch"
386+
).read_bytes()
387+
).decode(),
388+
"encoding": "base64",
389+
}
390+
},
391+
},
392+
],
393+
"notes": (
394+
"Vendored from upstream libtiff v4.7.1 with a commit from master "
395+
"cherry-picked to fix CVE-2026-4775."
396+
),
397+
},
359398
"externalReferences": [
360399
{"type": "website", "url": "https://libtiff.gitlab.io/libtiff/"},
361400
{

.github/workflows/cifuzz.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ jobs:
3030
steps:
3131
- name: Build Fuzzers
3232
id: build
33-
uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@d87225267726cf7ce1a3e17cf103c5ac943c4f05 # master
33+
uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@ed7c2f7301eecb625a3d427549056b0a90546bb5 # master
3434
with:
3535
oss-fuzz-project-name: 'pillow'
3636
language: python
3737
dry-run: false
3838
- name: Run Fuzzers
3939
id: run
40-
uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@d87225267726cf7ce1a3e17cf103c5ac943c4f05 # master
40+
uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@ed7c2f7301eecb625a3d427549056b0a90546bb5 # master
4141
with:
4242
oss-fuzz-project-name: 'pillow'
4343
fuzz-seconds: 600

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
# Drafts your next release notes as pull requests are merged into "main"
29-
- uses: release-drafter/release-drafter@5de93583980a40bd78603b6dfdcda5b4df377b32 # v7.2.0
29+
- uses: release-drafter/release-drafter@693d20e7c1ce1a81d3a41962f85914253b518449 # v7.3.1
3030
env:
3131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: "Check issues"
28-
uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
28+
uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
2929
with:
3030
repo-token: ${{ secrets.GITHUB_TOKEN }}
3131
only-labels: "Awaiting OP Action"

.github/workflows/test-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373

7474
- name: Set up QEMU
7575
if: "matrix.qemu-arch"
76-
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
76+
uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
7777
with:
7878
platforms: ${{ matrix.qemu-arch }}
7979

@@ -101,7 +101,7 @@ jobs:
101101
.ci/after_success.sh
102102
103103
- name: Upload coverage
104-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
104+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
105105
with:
106106
flags: GHA_Docker
107107
name: ${{ matrix.docker }}

.github/workflows/test-mingw.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
.ci/test.sh
8383
8484
- name: Upload coverage
85-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
85+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
8686
with:
8787
files: ./coverage.xml
8888
flags: GHA_Windows

0 commit comments

Comments
 (0)