Skip to content

Commit f402333

Browse files
authored
Merge branch 'main' into convert_mode
2 parents e617e60 + dc3ea89 commit f402333

280 files changed

Lines changed: 5188 additions & 2762 deletions

File tree

Some content is hidden

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

.appveyor.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
skip_commits:
2+
files:
3+
- ".github/**"
4+
- ".gitmodules"
5+
- "docs/**"
6+
- "wheels/**"
7+
18
version: '{build}'
29
clone_folder: c:\pillow
310
init:
@@ -6,6 +13,7 @@ init:
613
# Uncomment previous line to get RDP access during the build.
714

815
environment:
16+
COVERAGE_CORE: sysmon
917
EXECUTABLE: python.exe
1018
TEST_OPTIONS:
1119
DEPLOY: YES
@@ -26,7 +34,7 @@ install:
2634
- xcopy /S /Y c:\test-images-main\* c:\pillow\tests\images
2735
- curl -fsSL -o nasm-win64.zip https://raw.githubusercontent.com/python-pillow/pillow-depends/main/nasm-2.16.01-win64.zip
2836
- 7z x nasm-win64.zip -oc:\
29-
- choco install ghostscript --version=10.0.0.20230317
37+
- choco install ghostscript --version=10.3.0
3038
- path c:\nasm-2.16.01;C:\Program Files\gs\gs10.00.0\bin;%PATH%
3139
- cd c:\pillow\winbuild\
3240
- ps: |

.ci/requirements-cibw.txt

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

.ci/requirements-mypy.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mypy==1.9.0

.coveragerc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ exclude_also =
1212
except ImportError
1313
if TYPE_CHECKING:
1414
@abc.abstractmethod
15+
# Empty bodies in protocols or abstract methods
16+
^\s*def [a-zA-Z0-9_]+\(.*\)(\s*->.*)?:\s*\.\.\.(\s*#.*)?$
17+
^\s*\.\.\.(\s*#.*)?$
1518

1619
[run]
1720
omit =

.github/FUNDING.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
tidelift: "pypi/Pillow"
1+
tidelift: "pypi/pillow"

.github/ISSUE_TEMPLATE/ISSUE_REPORT.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,21 @@ Thank you.
4848
* Python:
4949
* Pillow:
5050

51+
```text
52+
Please paste here the output of running:
53+
54+
python3 -m PIL.report
55+
or
56+
python3 -m PIL --report
57+
58+
Or the output of the following Python code:
59+
60+
from PIL import report
61+
# or
62+
from PIL import features
63+
features.pilinfo(supported_formats=False)
64+
```
65+
5166
<!--
5267
Please include **code** that reproduces the issue and whenever possible, an **image** that demonstrates the issue. Please upload images to GitHub, not to third-party file hosting sites. If necessary, add the image to a zip or tar archive.
5368

.github/workflows/docs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ on:
77
paths:
88
- ".github/workflows/docs.yml"
99
- "docs/**"
10+
- "src/PIL/**"
1011
pull_request:
1112
paths:
1213
- ".github/workflows/docs.yml"
1314
- "docs/**"
15+
- "src/PIL/**"
1416
workflow_dispatch:
1517

1618
permissions:

.github/workflows/test-cygwin.yml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ concurrency:
2626
group: ${{ github.workflow }}-${{ github.ref }}
2727
cancel-in-progress: true
2828

29+
env:
30+
COVERAGE_CORE: sysmon
31+
2932
jobs:
3033
build:
3134
runs-on: windows-latest
@@ -47,7 +50,7 @@ jobs:
4750
uses: actions/checkout@v4
4851

4952
- name: Install Cygwin
50-
uses: egor-tensin/setup-cygwin@v4
53+
uses: cygwin/cygwin-install-action@v4
5154
with:
5255
packages: >
5356
gcc-g++
@@ -68,7 +71,6 @@ jobs:
6871
make
6972
netpbm
7073
perl
71-
python39=3.9.16-1
7274
python3${{ matrix.python-minor-version }}-cffi
7375
python3${{ matrix.python-minor-version }}-cython
7476
python3${{ matrix.python-minor-version }}-devel
@@ -86,21 +88,15 @@ jobs:
8688

8789
- name: Select Python version
8890
run: |
89-
ln -sf c:/tools/cygwin/bin/python3.${{ matrix.python-minor-version }} c:/tools/cygwin/bin/python3
90-
91-
- name: Get latest NumPy version
92-
id: latest-numpy
93-
shell: bash.exe -eo pipefail -o igncr "{0}"
94-
run: |
95-
python3 -m pip list --outdated | grep numpy | sed -r 's/ +/ /g' | cut -d ' ' -f 3 | sed 's/^/version=/' >> $GITHUB_OUTPUT
91+
ln -sf c:/cygwin/bin/python3.${{ matrix.python-minor-version }} c:/cygwin/bin/python3
9692
9793
- name: pip cache
9894
uses: actions/cache@v4
9995
with:
10096
path: 'C:\cygwin\home\runneradmin\.cache\pip'
101-
key: ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-numpy${{ steps.latest-numpy.outputs.version }}-${{ hashFiles('.ci/install.sh') }}
97+
key: ${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-${{ hashFiles('.ci/install.sh') }}
10298
restore-keys: |
103-
${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-numpy${{ steps.latest-numpy.outputs.version }}-
99+
${{ runner.os }}-cygwin-pip3.${{ matrix.python-minor-version }}-
104100
105101
- name: Build system information
106102
run: |
@@ -110,11 +106,6 @@ jobs:
110106
run: |
111107
bash.exe .ci/install.sh
112108
113-
- name: Upgrade NumPy
114-
shell: dash.exe -l "{0}"
115-
run: |
116-
python3 -m pip install -U "numpy<1.26"
117-
118109
- name: Build
119110
shell: bash.exe -eo pipefail -o igncr "{0}"
120111
run: |

.github/workflows/test-mingw.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ concurrency:
2626
group: ${{ github.workflow }}-${{ github.ref }}
2727
cancel-in-progress: true
2828

29+
env:
30+
COVERAGE_CORE: sysmon
31+
2932
jobs:
3033
build:
3134
runs-on: windows-latest
@@ -64,10 +67,10 @@ jobs:
6467
mingw-w64-x86_64-python3-cffi \
6568
mingw-w64-x86_64-python3-numpy \
6669
mingw-w64-x86_64-python3-olefile \
67-
mingw-w64-x86_64-python3-pip \
6870
mingw-w64-x86_64-python3-setuptools \
6971
mingw-w64-x86_64-python-pyqt6
7072
73+
python3 -m ensurepip
7174
python3 -m pip install pyroma pytest pytest-cov pytest-timeout
7275
7376
pushd depends && ./install_extra_test_images.sh && popd

.github/workflows/test-windows.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ concurrency:
2626
group: ${{ github.workflow }}-${{ github.ref }}
2727
cancel-in-progress: true
2828

29+
env:
30+
COVERAGE_CORE: sysmon
31+
2932
jobs:
3033
build:
3134
runs-on: windows-latest
@@ -66,16 +69,24 @@ jobs:
6669
- name: Print build system information
6770
run: python3 .github/workflows/system-info.py
6871

69-
- name: python3 -m pip install pytest pytest-cov pytest-timeout defusedxml olefile pyroma
70-
run: python3 -m pip install pytest pytest-cov pytest-timeout defusedxml olefile pyroma
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
7182
7283
- name: Install dependencies
7384
id: install
7485
run: |
7586
choco install nasm --no-progress
7687
echo "C:\Program Files\NASM" >> $env:GITHUB_PATH
7788
78-
choco install ghostscript --version=10.0.0.20230317 --no-progress
89+
choco install ghostscript --version=10.3.0 --no-progress
7990
echo "C:\Program Files\gs\gs10.00.0\bin" >> $env:GITHUB_PATH
8091
8192
# Install extra test images

0 commit comments

Comments
 (0)