Skip to content

Commit 4262253

Browse files
radarhereradarhere
committed
Merge branch 'main' into vtf-support
2 parents 1c7b86a + e0c30d2 commit 4262253

File tree

106 files changed

+2382
-1988
lines changed

Some content is hidden

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

106 files changed

+2382
-1988
lines changed

‎.appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ install:
2525
- mv c:\pillow-depends-main c:\pillow-depends
2626
- xcopy /S /Y c:\pillow-depends\test_images\* c:\pillow\tests\images
2727
- 7z x ..\pillow-depends\nasm-2.15.05-win64.zip -oc:\
28-
- ..\pillow-depends\gs9561w32.exe /S
29-
- path c:\nasm-2.15.05;C:\Program Files (x86)\gs\gs9.56.1\bin;%PATH%
28+
- ..\pillow-depends\gs1000w32.exe /S
29+
- path c:\nasm-2.15.05;C:\Program Files (x86)\gs\gs10.0.0\bin;%PATH%
3030
- cd c:\pillow\winbuild\
3131
- ps: |
3232
c:\python37\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\

‎.ci/install.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ python3 -m pip install -U pytest-timeout
3737
python3 -m pip install pyroma
3838

3939
if [[ $(uname) != CYGWIN* ]]; then
40-
# TODO Remove condition when NumPy supports 3.11
41-
if ! [ "$GHA_PYTHON_VERSION" == "3.11-dev" ]; then python3 -m pip install numpy ; fi
40+
python3 -m pip install numpy
4241

4342
# PyQt6 doesn't support PyPy3
4443
if [[ $GHA_PYTHON_VERSION == 3.* ]]; then

‎.github/renovate.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:base"
5+
],
6+
"labels": [
7+
"Dependency"
8+
],
9+
"packageRules": [
10+
{
11+
"groupName": "github-actions",
12+
"matchManagers": ["github-actions"],
13+
"separateMajorMinor": "false"
14+
}
15+
],
16+
"schedule": ["on the 3rd day of the month"]
17+
}

‎.github/workflows/cifuzz.yml

+7
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ on:
1111
- "**.h"
1212
workflow_dispatch:
1313

14+
permissions:
15+
contents: read
16+
17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.ref }}
19+
cancel-in-progress: true
20+
1421
jobs:
1522
Fuzzing:
1623
runs-on: ubuntu-latest

‎.github/workflows/lint.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on: [push, pull_request, workflow_dispatch]
55
permissions:
66
contents: read
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
build:
1014

@@ -16,15 +20,15 @@ jobs:
1620
- uses: actions/checkout@v3
1721

1822
- name: pre-commit cache
19-
uses: actions/cache@v2
23+
uses: actions/cache@v3
2024
with:
2125
path: ~/.cache/pre-commit
2226
key: lint-pre-commit-${{ hashFiles('**/.pre-commit-config.yaml') }}
2327
restore-keys: |
2428
lint-pre-commit-
2529
2630
- name: Set up Python
27-
uses: actions/setup-python@v3
31+
uses: actions/setup-python@v4
2832
with:
2933
python-version: "3.10"
3034
cache: pip

‎.github/workflows/macos-install.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ python3 -m pip install -U pytest-timeout
1414
python3 -m pip install pyroma
1515

1616
echo -e "[openblas]\nlibraries = openblas\nlibrary_dirs = /usr/local/opt/openblas/lib" >> ~/.numpy-site.cfg
17-
# TODO Remove condition when NumPy supports 3.11
18-
if ! [ "$GHA_PYTHON_VERSION" == "3.11-dev" ]; then python3 -m pip install numpy ; fi
17+
python3 -m pip install numpy
1918

2019
# extra test images
2120
pushd depends && ./install_extra_test_images.sh && popd

‎.github/workflows/release-drafter.yml

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ on:
1010
permissions:
1111
contents: read
1212

13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
1317
jobs:
1418
update_release_draft:
1519
permissions:

‎.github/workflows/stale.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
permissions:
99
issues: write
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
stale:
1317
if: github.repository_owner == 'python-pillow'
@@ -16,7 +20,7 @@ jobs:
1620

1721
steps:
1822
- name: "Check issues"
19-
uses: actions/stale@v5
23+
uses: actions/stale@v6
2024
with:
2125
repo-token: ${{ secrets.GITHUB_TOKEN }}
2226
only-labels: "Awaiting OP Action"

‎.github/workflows/test-cygwin.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ name: Test Cygwin
22

33
on: [push, pull_request, workflow_dispatch]
44

5+
permissions:
6+
contents: read
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
512
jobs:
613
build:
714
runs-on: windows-latest
@@ -41,7 +48,7 @@ jobs:
4148
qt5-devel-tools subversion xorg-server-extra zlib-devel
4249
4350
- name: Add Lapack to PATH
44-
uses: egor-tensin/cleanup-path@v1
51+
uses: egor-tensin/cleanup-path@v2
4552
with:
4653
dirs: 'C:\cygwin\bin;C:\cygwin\lib\lapack'
4754

‎.github/workflows/test-docker.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on: [push, pull_request, workflow_dispatch]
55
permissions:
66
contents: read
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
build:
1014

@@ -79,7 +83,7 @@ jobs:
7983
MATRIX_DOCKER: ${{ matrix.docker }}
8084

8185
- name: Upload coverage
82-
uses: codecov/codecov-action@v1
86+
uses: codecov/codecov-action@v3
8387
with:
8488
flags: GHA_Docker
8589
name: ${{ matrix.docker }}

‎.github/workflows/test-mingw.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on: [push, pull_request, workflow_dispatch]
55
permissions:
66
contents: read
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
build:
1014
runs-on: windows-latest
@@ -73,11 +77,11 @@ jobs:
7377
python3 -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests
7478
7579
- name: Upload coverage
76-
run: |
77-
python3 -m pip install codecov
78-
bash <(curl -s https://codecov.io/bash) -F GHA_Windows
79-
env:
80-
CODECOV_NAME: ${{ matrix.name }}
80+
uses: codecov/codecov-action@v3
81+
with:
82+
file: ./coverage.xml
83+
flags: GHA_Windows
84+
name: ${{ matrix.name }}
8185

8286
success:
8387
permissions:

‎.github/workflows/test-valgrind.yml

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ on:
1616
permissions:
1717
contents: read
1818

19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.ref }}
21+
cancel-in-progress: true
22+
1923
jobs:
2024
build:
2125

‎.github/workflows/test-windows.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on: [push, pull_request, workflow_dispatch]
55
permissions:
66
contents: read
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
build:
1014
runs-on: windows-latest
@@ -36,7 +40,7 @@ jobs:
3640

3741
# sets env: pythonLocation
3842
- name: Set up Python
39-
uses: actions/setup-python@v3
43+
uses: actions/setup-python@v4
4044
with:
4145
python-version: ${{ matrix.python-version }}
4246
architecture: ${{ matrix.architecture }}
@@ -55,8 +59,8 @@ jobs:
5559
7z x winbuild\depends\nasm-2.15.05-win64.zip "-o$env:RUNNER_WORKSPACE\"
5660
echo "$env:RUNNER_WORKSPACE\nasm-2.15.05" >> $env:GITHUB_PATH
5761
58-
winbuild\depends\gs9561w32.exe /S
59-
echo "C:\Program Files (x86)\gs\gs9.56.1\bin" >> $env:GITHUB_PATH
62+
winbuild\depends\gs1000w32.exe /S
63+
echo "C:\Program Files (x86)\gs\gs10.0.0\bin" >> $env:GITHUB_PATH
6064
6165
xcopy /S /Y winbuild\depends\test_images\* Tests\images\
6266
@@ -66,7 +70,7 @@ jobs:
6670

6771
- name: Cache build
6872
id: build-cache
69-
uses: actions/cache@v2
73+
uses: actions/cache@v3
7074
with:
7175
path: winbuild\build
7276
key:
@@ -171,7 +175,7 @@ jobs:
171175
shell: pwsh
172176

173177
- name: Upload coverage
174-
uses: codecov/codecov-action@v1
178+
uses: codecov/codecov-action@v3
175179
with:
176180
file: ./coverage.xml
177181
flags: GHA_Windows

‎.github/workflows/test.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ on: [push, pull_request, workflow_dispatch]
55
permissions:
66
contents: read
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
jobs:
913
build:
1014

@@ -30,11 +34,6 @@ jobs:
3034
REVERSE: "--reverse"
3135
- python-version: "3.8"
3236
PYTHONOPTIMIZE: 2
33-
# Include new variables for Codecov
34-
- os: ubuntu-latest
35-
codecov-flag: GHA_Ubuntu
36-
- os: macos-latest
37-
codecov-flag: GHA_macOS
3837

3938
runs-on: ${{ matrix.os }}
4039
name: ${{ matrix.os }} Python ${{ matrix.python-version }}
@@ -43,7 +42,7 @@ jobs:
4342
- uses: actions/checkout@v3
4443

4544
- name: Set up Python ${{ matrix.python-version }}
46-
uses: actions/setup-python@v3
45+
uses: actions/setup-python@v4
4746
with:
4847
python-version: ${{ matrix.python-version }}
4948
cache: pip
@@ -99,17 +98,18 @@ jobs:
9998
- name: Docs
10099
if: startsWith(matrix.os, 'ubuntu') && matrix.python-version == 3.10
101100
run: |
102-
python3 -m pip install furo sphinx-copybutton sphinx-issues sphinx-removed-in sphinxext-opengraph
103101
make doccheck
104102
105103
- name: After success
106104
run: |
107105
.ci/after_success.sh
108106
109107
- name: Upload coverage
110-
run: bash <(curl -s https://codecov.io/bash) -F ${{ matrix.codecov-flag }}
111-
env:
112-
CODECOV_NAME: ${{ matrix.os }} Python ${{ matrix.python-version }}
108+
uses: codecov/codecov-action@v3
109+
with:
110+
file: ./coverage.xml
111+
flags: ${{ matrix.os == 'macos-latest' && 'GHA_macOS' || 'GHA_Ubuntu' }}
112+
name: ${{ matrix.os }} Python ${{ matrix.python-version }}
113113

114114
success:
115115
permissions:

‎.github/workflows/tidelift.yml

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: Tidelift Align
2+
23
on:
34
schedule:
45
- cron: "30 2 * * *" # daily at 02:30 UTC
@@ -15,6 +16,10 @@ on:
1516
permissions:
1617
contents: read
1718

19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.ref }}
21+
cancel-in-progress: true
22+
1823
jobs:
1924
build:
2025
if: github.repository_owner == 'python-pillow'

‎.pre-commit-config.yaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/psf/black
3-
rev: 22.6.0
3+
rev: 22.8.0
44
hooks:
55
- id: black
66
args: ["--target-version", "py37"]
@@ -14,18 +14,18 @@ repos:
1414
- id: isort
1515

1616
- repo: https://github.com/asottile/yesqa
17-
rev: v1.3.0
17+
rev: v1.4.0
1818
hooks:
1919
- id: yesqa
2020

2121
- repo: https://github.com/Lucas-C/pre-commit-hooks
22-
rev: v1.3.0
22+
rev: v1.3.1
2323
hooks:
2424
- id: remove-tabs
2525
exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.opt$)
2626

2727
- repo: https://github.com/PyCQA/flake8
28-
rev: 5.0.2
28+
rev: 5.0.4
2929
hooks:
3030
- id: flake8
3131
additional_dependencies: [flake8-2020, flake8-implicit-str-concat]
@@ -40,6 +40,7 @@ repos:
4040
rev: v4.3.0
4141
hooks:
4242
- id: check-merge-conflict
43+
- id: check-json
4344
- id: check-yaml
4445

4546
- repo: https://github.com/sphinx-contrib/sphinx-lint

0 commit comments

Comments
 (0)