Skip to content

Commit 48f1838

Browse files
authored
Merge branch 'main' into gha-windows-32-bit
2 parents 1c4f29f + 2e7da07 commit 48f1838

16 files changed

+55
-29
lines changed

.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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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

.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: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,20 @@ jobs:
4949
steps:
5050
- name: Checkout Pillow
5151
uses: actions/checkout@v4
52+
with:
53+
persist-credentials: false
5254

5355
- name: Checkout cached dependencies
5456
uses: actions/checkout@v4
5557
with:
58+
persist-credentials: false
5659
repository: python-pillow/pillow-depends
5760
path: winbuild\depends
5861

5962
- name: Checkout extra test images
6063
uses: actions/checkout@v4
6164
with:
65+
persist-credentials: false
6266
repository: python-pillow/test-images
6367
path: Tests\test-images
6468

@@ -75,22 +79,14 @@ jobs:
7579
- name: Print build system information
7680
run: python3 .github/workflows/system-info.py
7781

78-
- name: Install Python dependencies
79-
run: >
80-
python3 -m pip install
81-
coverage>=7.4.2
82-
defusedxml
83-
olefile
84-
pyroma
85-
pytest
86-
pytest-cov
87-
pytest-timeout
82+
- name: Upgrade pip
83+
run: |
84+
python3 -m pip install --upgrade pip
8885
8986
- name: Install CPython dependencies
9087
if: "!contains(matrix.python-version, 'pypy') && matrix.architecture != 'x86'"
91-
run: >
92-
python3 -m pip install
93-
PyQt6
88+
run: |
89+
python3 -m pip install PyQt6
9490
9591
- name: Install dependencies
9692
id: install
@@ -190,7 +186,7 @@ jobs:
190186
- name: Build Pillow
191187
run: |
192188
$FLAGS="-C raqm=vendor -C fribidi=vendor"
193-
cmd /c "winbuild\build\build_env.cmd && $env:pythonLocation\python.exe -m pip install -v $FLAGS ."
189+
cmd /c "winbuild\build\build_env.cmd && $env:pythonLocation\python.exe -m pip install -v $FLAGS .[tests]"
194190
& $env:pythonLocation\python.exe selftest.py --installed
195191
shell: pwsh
196192

.github/workflows/test.yml

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

6464
steps:
6565
- uses: actions/checkout@v4
66+
with:
67+
persist-credentials: false
6668

6769
- name: Set up Python ${{ matrix.python-version }}
6870
uses: actions/setup-python@v5

0 commit comments

Comments
 (0)