Skip to content

Commit dc3c489

Browse files
authored
Merge branch 'main' into context_manager
2 parents e3f4200 + 2e7da07 commit dc3c489

Some content is hidden

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

52 files changed

+646
-160
lines changed

.ci/requirements-mypy.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mypy==1.11.2
1+
mypy==1.13.0
22
IceSpringPySideStubs-PyQt6
33
IceSpringPySideStubs-PySide6
44
ipython

.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/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: 2 additions & 0 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

.github/workflows/test-docker.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ jobs:
4646
centos-stream-9-amd64,
4747
debian-12-bookworm-x86,
4848
debian-12-bookworm-amd64,
49-
fedora-39-amd64,
5049
fedora-40-amd64,
50+
fedora-41-amd64,
5151
gentoo,
5252
ubuntu-22.04-jammy-amd64,
5353
ubuntu-24.04-noble-amd64,
@@ -65,6 +65,8 @@ jobs:
6565

6666
steps:
6767
- uses: actions/checkout@v4
68+
with:
69+
persist-credentials: false
6870

6971
- name: Build system information
7072
run: python3 .github/workflows/system-info.py
@@ -102,7 +104,6 @@ jobs:
102104
with:
103105
flags: GHA_Docker
104106
name: ${{ matrix.docker }}
105-
gcov: true
106107
token: ${{ secrets.CODECOV_ORG_TOKEN }}
107108

108109
success:

.github/workflows/test-mingw.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ jobs:
4646
steps:
4747
- name: Checkout Pillow
4848
uses: actions/checkout@v4
49+
with:
50+
persist-credentials: false
4951

5052
- name: Set up shell
5153
run: echo "C:\msys64\usr\bin\" >> $env:GITHUB_PATH

.github/workflows/test-valgrind.yml

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

4141
steps:
4242
- uses: actions/checkout@v4
43+
with:
44+
persist-credentials: false
4345

4446
- name: Build system information
4547
run: python3 .github/workflows/system-info.py

.github/workflows/test-windows.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,20 @@ jobs:
4444
steps:
4545
- name: Checkout Pillow
4646
uses: actions/checkout@v4
47+
with:
48+
persist-credentials: false
4749

4850
- name: Checkout cached dependencies
4951
uses: actions/checkout@v4
5052
with:
53+
persist-credentials: false
5154
repository: python-pillow/pillow-depends
5255
path: winbuild\depends
5356

5457
- name: Checkout extra test images
5558
uses: actions/checkout@v4
5659
with:
60+
persist-credentials: false
5761
repository: python-pillow/test-images
5862
path: Tests\test-images
5963

@@ -69,16 +73,14 @@ jobs:
6973
- name: Print build system information
7074
run: python3 .github/workflows/system-info.py
7175

72-
- name: Install Python dependencies
73-
run: >
74-
python3 -m pip install
75-
coverage>=7.4.2
76-
defusedxml
77-
olefile
78-
pyroma
79-
pytest
80-
pytest-cov
81-
pytest-timeout
76+
- name: Upgrade pip
77+
run: |
78+
python3 -m pip install --upgrade pip
79+
80+
- name: Install CPython dependencies
81+
if: "!contains(matrix.python-version, 'pypy')"
82+
run: |
83+
python3 -m pip install PyQt6
8284
8385
- name: Install dependencies
8486
id: install
@@ -178,7 +180,7 @@ jobs:
178180
- name: Build Pillow
179181
run: |
180182
$FLAGS="-C raqm=vendor -C fribidi=vendor"
181-
cmd /c "winbuild\build\build_env.cmd && $env:pythonLocation\python.exe -m pip install -v $FLAGS ."
183+
cmd /c "winbuild\build\build_env.cmd && $env:pythonLocation\python.exe -m pip install -v $FLAGS .[tests]"
182184
& $env:pythonLocation\python.exe selftest.py --installed
183185
shell: pwsh
184186

0 commit comments

Comments
 (0)