Skip to content

Commit e6c528d

Browse files
authored
Merge branch 'main' into palette
2 parents 4b5c1e8 + 8246673 commit e6c528d

Some content is hidden

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

50 files changed

+446
-267
lines changed

.ci/requirements-mypy.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
mypy==1.9.0
1+
mypy==1.10.0

.github/workflows/test-cygwin.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ jobs:
5555
packages: >
5656
gcc-g++
5757
ghostscript
58+
git
5859
ImageMagick
5960
jpeg
6061
libfreetype-devel
@@ -132,11 +133,12 @@ jobs:
132133
bash.exe .ci/after_success.sh
133134
134135
- name: Upload coverage
135-
uses: codecov/codecov-action@v3.1.5
136+
uses: codecov/codecov-action@v4
136137
with:
137138
file: ./coverage.xml
138139
flags: GHA_Cygwin
139140
name: Cygwin Python 3.${{ matrix.python-minor-version }}
141+
token: ${{ secrets.CODECOV_ORG_TOKEN }}
140142

141143
success:
142144
permissions:

.github/workflows/test-docker.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
docker: [
3737
# Run slower jobs first to give them a headstart and reduce waiting time
3838
ubuntu-22.04-jammy-arm64v8,
39-
ubuntu-22.04-jammy-ppc64le,
40-
ubuntu-22.04-jammy-s390x,
39+
ubuntu-24.04-noble-ppc64le,
40+
ubuntu-24.04-noble-s390x,
4141
# Then run the remainder
4242
alpine,
4343
amazon-2-amd64,
@@ -47,19 +47,20 @@ jobs:
4747
debian-11-bullseye-amd64,
4848
debian-12-bookworm-x86,
4949
debian-12-bookworm-amd64,
50-
fedora-38-amd64,
5150
fedora-39-amd64,
51+
fedora-40-amd64,
5252
gentoo,
5353
ubuntu-20.04-focal-amd64,
5454
ubuntu-22.04-jammy-amd64,
55+
ubuntu-24.04-noble-amd64,
5556
]
5657
dockerTag: [main]
5758
include:
5859
- docker: "ubuntu-22.04-jammy-arm64v8"
5960
qemu-arch: "aarch64"
60-
- docker: "ubuntu-22.04-jammy-ppc64le"
61+
- docker: "ubuntu-24.04-noble-ppc64le"
6162
qemu-arch: "ppc64le"
62-
- docker: "ubuntu-22.04-jammy-s390x"
63+
- docker: "ubuntu-24.04-noble-s390x"
6364
qemu-arch: "s390x"
6465

6566
name: ${{ matrix.docker }}
@@ -81,8 +82,8 @@ jobs:
8182
8283
- name: Docker build
8384
run: |
84-
# The Pillow user in the docker container is UID 1000
85-
sudo chown -R 1000 $GITHUB_WORKSPACE
85+
# The Pillow user in the docker container is UID 1001
86+
sudo chown -R 1001 $GITHUB_WORKSPACE
8687
docker run --name pillow_container -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
8788
sudo chown -R runner $GITHUB_WORKSPACE
8889
@@ -99,11 +100,12 @@ jobs:
99100
MATRIX_DOCKER: ${{ matrix.docker }}
100101

101102
- name: Upload coverage
102-
uses: codecov/codecov-action@v3.1.5
103+
uses: codecov/codecov-action@v4
103104
with:
104105
flags: GHA_Docker
105106
name: ${{ matrix.docker }}
106107
gcov: true
108+
token: ${{ secrets.CODECOV_ORG_TOKEN }}
107109

108110
success:
109111
permissions:

.github/workflows/test-mingw.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ jobs:
8585
python3 -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests
8686
8787
- name: Upload coverage
88-
uses: codecov/codecov-action@v3.1.5
88+
uses: codecov/codecov-action@v4
8989
with:
9090
file: ./coverage.xml
9191
flags: GHA_Windows
9292
name: "MSYS2 MinGW"
93+
token: ${{ secrets.CODECOV_ORG_TOKEN }}

.github/workflows/test-valgrind.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
5151
- name: Build and Run Valgrind
5252
run: |
53-
# The Pillow user in the docker container is UID 1000
54-
sudo chown -R 1000 $GITHUB_WORKSPACE
53+
# The Pillow user in the docker container is UID 1001
54+
sudo chown -R 1001 $GITHUB_WORKSPACE
5555
docker run --name pillow_container -e "PILLOW_VALGRIND_TEST=true" -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
5656
sudo chown -R runner $GITHUB_WORKSPACE

.github/workflows/test-windows.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,12 @@ jobs:
213213
shell: pwsh
214214

215215
- name: Upload coverage
216-
uses: codecov/codecov-action@v3.1.5
216+
uses: codecov/codecov-action@v4
217217
with:
218218
file: ./coverage.xml
219219
flags: GHA_Windows
220220
name: ${{ runner.os }} Python ${{ matrix.python-version }}
221+
token: ${{ secrets.CODECOV_ORG_TOKEN }}
221222

222223
success:
223224
permissions:

.github/workflows/test.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ jobs:
5757
- python-version: "3.10"
5858
PYTHONOPTIMIZE: 2
5959
# M1 only available for 3.10+
60-
- os: "macos-latest"
60+
- os: "macos-13"
6161
python-version: "3.9"
62-
- os: "macos-latest"
62+
- os: "macos-13"
6363
python-version: "3.8"
6464
exclude:
6565
- os: "macos-14"
@@ -150,11 +150,12 @@ jobs:
150150
.ci/after_success.sh
151151
152152
- name: Upload coverage
153-
uses: codecov/codecov-action@v3.1.5
153+
uses: codecov/codecov-action@v4
154154
with:
155155
flags: ${{ matrix.os == 'ubuntu-latest' && 'GHA_Ubuntu' || 'GHA_macOS' }}
156156
name: ${{ matrix.os }} Python ${{ matrix.python-version }}
157157
gcov: true
158+
token: ${{ secrets.CODECOV_ORG_TOKEN }}
158159

159160
success:
160161
permissions:

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
matrix:
9898
include:
9999
- name: "macOS x86_64"
100-
os: macos-latest
100+
os: macos-13
101101
cibw_arch: x86_64
102102
macosx_deployment_target: "10.10"
103103
- name: "macOS arm64"

.readthedocs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ build:
66
os: ubuntu-22.04
77
tools:
88
python: "3"
9+
jobs:
10+
post_checkout:
11+
- git remote add upstream https://github.com/python-pillow/Pillow.git # For forks
12+
- git fetch upstream --tags
913

1014
python:
1115
install:

CHANGES.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,24 @@ Changelog (Pillow)
55
10.4.0 (unreleased)
66
-------------------
77

8+
- Deprecate BGR;15, BGR;16 and BGR;24 modes #7978
9+
[radarhere, hugovk]
10+
11+
- Fix ImagingAccess for I;16N on big-endian #7921
12+
[Yay295, radarhere]
13+
14+
- Support reading P mode TIFF images with padding #7996
15+
[radarhere]
16+
17+
- Deprecate support for libtiff < 4 #7998
18+
[radarhere, hugovk]
19+
20+
- Corrected ImageShow UnixViewer command #7987
21+
[radarhere]
22+
23+
- Use functools.cached_property in ImageStat #7952
24+
[nulano, hugovk, radarhere]
25+
826
- Add support for reading BITMAPV2INFOHEADER and BITMAPV3INFOHEADER #7956
927
[Cirras, radarhere]
1028

0 commit comments

Comments
 (0)