Skip to content

Commit 8e8a161

Browse files
authored
Merge branch 'main' into feat/riscv64-wheels
2 parents c673eb8 + 9568bce commit 8e8a161

Some content is hidden

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

44 files changed

+635
-299
lines changed

.github/workflows/cifuzz.yml

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

27+
env:
28+
FORCE_COLOR: 1
29+
2730
jobs:
2831
Fuzzing:
2932
runs-on: ubuntu-latest

.github/workflows/release-drafter.yml

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

17+
env:
18+
FORCE_COLOR: 1
19+
1720
jobs:
1821
update_release_draft:
1922
permissions:

.github/workflows/stale.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ concurrency:
1212
group: ${{ github.workflow }}-${{ github.ref }}
1313
cancel-in-progress: true
1414

15+
env:
16+
FORCE_COLOR: 1
17+
1518
jobs:
1619
stale:
1720
if: github.repository_owner == 'python-pillow'

.github/workflows/test-docker.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+
FORCE_COLOR: 1
31+
2932
jobs:
3033
build:
3134

.github/workflows/test-mingw.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ concurrency:
2828

2929
env:
3030
COVERAGE_CORE: sysmon
31+
FORCE_COLOR: 1
3132

3233
jobs:
3334
build:

.github/workflows/test-valgrind-memory.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+
FORCE_COLOR: 1
31+
2932
jobs:
3033
build:
3134

.github/workflows/test-valgrind.yml

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

27+
env:
28+
FORCE_COLOR: 1
29+
2730
jobs:
2831
build:
2932

.github/workflows/test-windows.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ concurrency:
2828

2929
env:
3030
COVERAGE_CORE: sysmon
31+
FORCE_COLOR: 1
3132

3233
jobs:
3334
build:
@@ -98,8 +99,8 @@ jobs:
9899
choco install nasm --no-progress
99100
echo "C:\Program Files\NASM" >> $env:GITHUB_PATH
100101
101-
choco install ghostscript --version=10.6.0 --no-progress
102-
echo "C:\Program Files\gs\gs10.06.0\bin" >> $env:GITHUB_PATH
102+
choco install ghostscript --version=10.7.0 --no-progress
103+
echo "C:\Program Files\gs\gs10.07.0\bin" >> $env:GITHUB_PATH
103104
104105
# Install extra test images
105106
xcopy /S /Y Tests\test-images\* Tests\images

.github/workflows/wheels-dependencies.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ fi
9090
ARCHIVE_SDIR=pillow-depends-main
9191

9292
# Package versions for fresh source builds.
93-
FREETYPE_VERSION=2.14.2
94-
HARFBUZZ_VERSION=13.0.1
95-
LIBPNG_VERSION=1.6.55
93+
FREETYPE_VERSION=2.14.3
94+
HARFBUZZ_VERSION=13.2.1
95+
LIBPNG_VERSION=1.6.56
9696
JPEGTURBO_VERSION=3.1.3
9797
OPENJPEG_VERSION=2.5.4
9898
XZ_VERSION=5.8.2
@@ -104,7 +104,7 @@ LIBWEBP_VERSION=1.6.0
104104
BZIP2_VERSION=1.0.8
105105
LIBXCB_VERSION=1.17.0
106106
BROTLI_VERSION=1.2.0
107-
LIBAVIF_VERSION=1.4.0
107+
LIBAVIF_VERSION=1.4.1
108108

109109
function build_pkg_config {
110110
if [ -e pkg-config-stamp ]; then return; fi
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
STARTFONT
22
FONT �
33
SIZE 10
4-
FONTBOUNDINGBOX
5-
CHARS
4+
FONTBOUNDINGBOX 1 1 0 0
5+
CHARS 1
66
STARTCHAR
7-
ENCODING
7+
ENCODING 65
88
BBX 2 5
99
ENDCHAR
1010
ENDFONT

0 commit comments

Comments
 (0)