Skip to content

Commit c8a58cf

Browse files
authored
Merge branch 'main' into 16bit_rgb_rawmodes
2 parents 46fbd74 + 94a8fcc commit c8a58cf

File tree

95 files changed

+863
-1235
lines changed

Some content is hidden

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

95 files changed

+863
-1235
lines changed

.appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ environment:
2121
- PYTHON: C:/Python312
2222
ARCHITECTURE: x86
2323
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
24-
- PYTHON: C:/Python38-x64
24+
- PYTHON: C:/Python39-x64
2525
ARCHITECTURE: AMD64
26-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
26+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
2727

2828

2929
install:
@@ -38,7 +38,7 @@ install:
3838
- path c:\nasm-2.16.03;C:\Program Files\gs\gs10.03.1\bin;%PATH%
3939
- cd c:\pillow\winbuild\
4040
- ps: |
41-
c:\python38\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\
41+
c:\python39\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\
4242
c:\pillow\winbuild\build\build_dep_all.cmd
4343
$host.SetShouldExit(0)
4444
- path C:\pillow\winbuild\build\bin;%PATH%

.ci/install.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ fi
2828

2929
python3 -m pip install --upgrade pip
3030
python3 -m pip install --upgrade wheel
31-
# TODO Update condition when cffi supports 3.13
32-
if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then PYTHONOPTIMIZE=0 python3 -m pip install cffi ; fi
3331
python3 -m pip install coverage
3432
python3 -m pip install defusedxml
3533
python3 -m pip install olefile
@@ -39,8 +37,7 @@ python3 -m pip install -U pytest-timeout
3937
python3 -m pip install pyroma
4038

4139
if [[ $(uname) != CYGWIN* ]]; then
42-
# TODO Update condition when NumPy supports 3.13
43-
if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then python3 -m pip install numpy ; fi
40+
python3 -m pip install numpy
4441

4542
# PyQt6 doesn't support PyPy3
4643
if [[ $GHA_PYTHON_VERSION == 3.* ]]; then
@@ -51,7 +48,6 @@ if [[ $(uname) != CYGWIN* ]]; then
5148
# Pyroma uses non-isolated build and fails with old setuptools
5249
if [[
5350
$GHA_PYTHON_VERSION == pypy3.9
54-
|| $GHA_PYTHON_VERSION == 3.8
5551
|| $GHA_PYTHON_VERSION == 3.9
5652
]]; then
5753
# To match pyproject.toml

.ci/requirements-cibw.txt

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

.coveragerc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@ exclude_also =
1919
[run]
2020
omit =
2121
Tests/32bit_segfault_check.py
22-
Tests/bench_cffi_access.py
2322
Tests/check_*.py
2423
Tests/createfontdatachunk.py

.github/workflows/macos-install.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,14 @@ else
1818
fi
1919
export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig"
2020

21-
# TODO Update condition when cffi supports 3.13
22-
if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then PYTHONOPTIMIZE=0 python3 -m pip install cffi ; fi
23-
2421
python3 -m pip install coverage
2522
python3 -m pip install defusedxml
2623
python3 -m pip install olefile
2724
python3 -m pip install -U pytest
2825
python3 -m pip install -U pytest-cov
2926
python3 -m pip install -U pytest-timeout
3027
python3 -m pip install pyroma
31-
32-
# TODO Update condition when NumPy supports 3.13
33-
if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then python3 -m pip install numpy ; fi
28+
python3 -m pip install numpy
3429

3530
# extra test images
3631
pushd depends && ./install_extra_test_images.sh && popd

.github/workflows/test-cygwin.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
strategy:
3636
fail-fast: false
3737
matrix:
38-
python-minor-version: [8, 9]
38+
python-minor-version: [9]
3939

4040
timeout-minutes: 40
4141

@@ -72,7 +72,6 @@ jobs:
7272
make
7373
netpbm
7474
perl
75-
python3${{ matrix.python-minor-version }}-cffi
7675
python3${{ matrix.python-minor-version }}-cython
7776
python3${{ matrix.python-minor-version }}-devel
7877
python3${{ matrix.python-minor-version }}-numpy

.github/workflows/test-docker.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,11 @@ jobs:
4444
amazon-2023-amd64,
4545
arch,
4646
centos-stream-9-amd64,
47-
debian-11-bullseye-amd64,
4847
debian-12-bookworm-x86,
4948
debian-12-bookworm-amd64,
5049
fedora-39-amd64,
5150
fedora-40-amd64,
5251
gentoo,
53-
ubuntu-20.04-focal-amd64,
5452
ubuntu-22.04-jammy-amd64,
5553
ubuntu-24.04-noble-amd64,
5654
]

.github/workflows/test-mingw.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ jobs:
6464
mingw-w64-x86_64-libtiff \
6565
mingw-w64-x86_64-libwebp \
6666
mingw-w64-x86_64-openjpeg2 \
67-
mingw-w64-x86_64-python3-cffi \
6867
mingw-w64-x86_64-python3-numpy \
6968
mingw-w64-x86_64-python3-olefile \
7069
mingw-w64-x86_64-python3-setuptools \

.github/workflows/test-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
strategy:
3636
fail-fast: false
3737
matrix:
38-
python-version: ["pypy3.10", "pypy3.9", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
38+
python-version: ["pypy3.10", "pypy3.9", "3.9", "3.10", "3.11", "3.12", "3.13"]
3939

4040
timeout-minutes: 30
4141

.github/workflows/test.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ jobs:
4848
"3.11",
4949
"3.10",
5050
"3.9",
51-
"3.8",
5251
]
5352
include:
5453
- python-version: "3.11"
@@ -59,13 +58,9 @@ jobs:
5958
# M1 only available for 3.10+
6059
- os: "macos-13"
6160
python-version: "3.9"
62-
- os: "macos-13"
63-
python-version: "3.8"
6461
exclude:
6562
- os: "macos-14"
6663
python-version: "3.9"
67-
- os: "macos-14"
68-
python-version: "3.8"
6964

7065
runs-on: ${{ matrix.os }}
7166
name: ${{ matrix.os }} Python ${{ matrix.python-version }}

0 commit comments

Comments
 (0)