Skip to content

Commit 413cae5

Browse files
authored
Merge branch 'main' into emf_records
2 parents b4ba466 + cbc55c4 commit 413cae5

60 files changed

Lines changed: 800 additions & 257 deletions

Some content is hidden

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

.ci/requirements-cibw.txt

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

.github/CONTRIBUTING.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Please send a pull request to the `main` branch. Please include [documentation](
1919
- Follow PEP 8.
2020
- When committing only documentation changes please include `[ci skip]` in the commit message to avoid running tests on AppVeyor.
2121
- Include [release notes](https://github.com/python-pillow/Pillow/tree/main/docs/releasenotes) as needed or appropriate with your bug fixes, feature additions and tests.
22-
- Do not add to the [changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) for proposed changes, as that is updated after changes are merged.
2322

2423
## Reporting Issues
2524

.github/release-drafter.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@ tag-template: "$NEXT_MINOR_VERSION"
33
change-template: '- $TITLE #$NUMBER [@$AUTHOR]'
44

55
categories:
6-
- title: "Dependencies"
7-
label: "Dependency"
6+
- title: "Removals"
7+
label: "Removal"
88
- title: "Deprecations"
99
label: "Deprecation"
1010
- title: "Documentation"
1111
label: "Documentation"
12-
- title: "Removals"
13-
label: "Removal"
12+
- title: "Dependencies"
13+
label: "Dependency"
1414
- title: "Testing"
1515
label: "Testing"
1616
- title: "Type hints"
1717
label: "Type hints"
18+
- title: "Other changes"
1819

1920
exclude-labels:
2021
- "changelog: skip"
@@ -23,6 +24,4 @@ template: |
2324
2425
https://pillow.readthedocs.io/en/stable/releasenotes/$NEXT_MINOR_VERSION.html
2526
26-
## Changes
27-
2827
$CHANGES

.github/renovate.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
"config:base"
4+
"config:recommended"
55
],
66
"labels": [
77
"Dependency"
88
],
99
"packageRules": [
1010
{
1111
"groupName": "github-actions",
12-
"matchManagers": ["github-actions"],
13-
"separateMajorMinor": "false"
12+
"matchManagers": [
13+
"github-actions"
14+
],
15+
"separateMajorMinor": false
1416
}
1517
],
16-
"schedule": ["on the 3rd day of the month"]
18+
"schedule": [
19+
"on the 3rd day of the month"
20+
]
1721
}

.github/workflows/docs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ jobs:
3333

3434
steps:
3535
- uses: actions/checkout@v4
36+
with:
37+
persist-credentials: false
3638

3739
- name: Set up Python
3840
uses: actions/setup-python@v5

.github/workflows/lint.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ jobs:
2121

2222
steps:
2323
- uses: actions/checkout@v4
24+
with:
25+
persist-credentials: false
2426

2527
- name: pre-commit cache
2628
uses: actions/cache@v4

.github/workflows/macos-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ fi
88
brew install \
99
freetype \
1010
ghostscript \
11+
jpeg-turbo \
1112
libimagequant \
12-
libjpeg \
1313
libtiff \
1414
little-cms2 \
1515
openjpeg \

.github/workflows/stale.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
workflow_dispatch:
77

88
permissions:
9-
issues: write
9+
contents: read
1010

1111
concurrency:
1212
group: ${{ github.workflow }}-${{ github.ref }}
@@ -15,6 +15,8 @@ concurrency:
1515
jobs:
1616
stale:
1717
if: github.repository_owner == 'python-pillow'
18+
permissions:
19+
issues: write
1820

1921
runs-on: ubuntu-latest
2022

.github/workflows/test-cygwin.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ jobs:
4848
4949
- name: Checkout Pillow
5050
uses: actions/checkout@v4
51+
with:
52+
persist-credentials: false
5153

5254
- name: Install Cygwin
5355
uses: cygwin/cygwin-install-action@v4
@@ -131,11 +133,12 @@ jobs:
131133
- name: After success
132134
run: |
133135
bash.exe .ci/after_success.sh
136+
rm C:\cygwin\bin\bash.EXE
134137
135138
- name: Upload coverage
136-
uses: codecov/codecov-action@v4
139+
uses: codecov/codecov-action@v5
137140
with:
138-
file: ./coverage.xml
141+
files: ./coverage.xml
139142
flags: GHA_Cygwin
140143
name: Cygwin Python 3.${{ matrix.python-minor-version }}
141144
token: ${{ secrets.CODECOV_ORG_TOKEN }}

.github/workflows/test-docker.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
debian-12-bookworm-x86,
4848
debian-12-bookworm-amd64,
4949
fedora-40-amd64,
50+
fedora-41-amd64,
5051
gentoo,
5152
ubuntu-22.04-jammy-amd64,
5253
ubuntu-24.04-noble-amd64,
@@ -64,6 +65,8 @@ jobs:
6465

6566
steps:
6667
- uses: actions/checkout@v4
68+
with:
69+
persist-credentials: false
6770

6871
- name: Build system information
6972
run: python3 .github/workflows/system-info.py
@@ -97,11 +100,10 @@ jobs:
97100
MATRIX_DOCKER: ${{ matrix.docker }}
98101

99102
- name: Upload coverage
100-
uses: codecov/codecov-action@v4
103+
uses: codecov/codecov-action@v5
101104
with:
102105
flags: GHA_Docker
103106
name: ${{ matrix.docker }}
104-
gcov: true
105107
token: ${{ secrets.CODECOV_ORG_TOKEN }}
106108

107109
success:

0 commit comments

Comments
 (0)