Skip to content

Commit cc094ca

Browse files
authored
Merge branch 'main' into imagefont
2 parents 83433d8 + bebf038 commit cc094ca

66 files changed

Lines changed: 500 additions & 296 deletions

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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ init:
66
# Uncomment previous line to get RDP access during the build.
77

88
environment:
9+
COVERAGE_CORE: sysmon
910
EXECUTABLE: python.exe
1011
TEST_OPTIONS:
1112
DEPLOY: YES

.ci/requirements-mypy.txt

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

.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/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: 3 additions & 0 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

.github/workflows/test-mingw.yml

Lines changed: 3 additions & 0 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

.github/workflows/test-windows.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,16 @@ 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
3235
strategy:
3336
fail-fast: false
3437
matrix:
35-
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.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-alpha.3"]
3639

3740
timeout-minutes: 30
3841

@@ -66,8 +69,16 @@ 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

.github/workflows/test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ concurrency:
2727
cancel-in-progress: true
2828

2929
env:
30+
COVERAGE_CORE: sysmon
3031
FORCE_COLOR: 1
3132

3233
jobs:

.github/workflows/wheels-dependencies.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ FREETYPE_VERSION=2.13.2
1919
HARFBUZZ_VERSION=8.3.0
2020
LIBPNG_VERSION=1.6.40
2121
JPEGTURBO_VERSION=3.0.1
22-
OPENJPEG_VERSION=2.5.0
22+
OPENJPEG_VERSION=2.5.2
2323
XZ_VERSION=5.4.5
2424
TIFF_VERSION=4.6.0
2525
LCMS2_VERSION=2.16
@@ -40,7 +40,7 @@ BROTLI_VERSION=1.1.0
4040

4141
if [[ -n "$IS_MACOS" ]] && [[ "$CIBW_ARCHS" == "x86_64" ]]; then
4242
function build_openjpeg {
43-
local out_dir=$(fetch_unpack https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz openjpeg-2.5.0.tar.gz)
43+
local out_dir=$(fetch_unpack https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz openjpeg-${OPENJPEG_VERSION}.tar.gz)
4444
(cd $out_dir \
4545
&& cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \
4646
&& make install)
@@ -93,6 +93,9 @@ function build {
9393
done
9494
fi
9595
build_openjpeg
96+
if [ -f /usr/local/lib64/libopenjp2.so ]; then
97+
cp /usr/local/lib64/libopenjp2.so /usr/local/lib
98+
fi
9699

97100
ORIGINAL_CFLAGS=$CFLAGS
98101
CFLAGS="$CFLAGS -O3 -DNDEBUG"

CHANGES.rst

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

8+
- Release GIL while calling ``WebPAnimDecoderGetNext`` #7782
9+
[evanmiller, radarhere]
10+
11+
- Fixed reading FLI/FLC images with a prefix chunk #7804
12+
[twolife]
13+
814
- Update wl-paste handling and return None for some errors in grabclipboard() on Linux #7745
915
[nik012003, radarhere]
1016

0 commit comments

Comments
 (0)