Skip to content

Commit 8e6426f

Browse files
authored
Merge branch 'main' into improved-xdg-dirs-support
2 parents d56ffeb + d87c1c1 commit 8e6426f

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ install:
3535
- curl -fsSL -o nasm-win64.zip https://raw.githubusercontent.com/python-pillow/pillow-depends/main/nasm-2.16.03-win64.zip
3636
- 7z x nasm-win64.zip -oc:\
3737
- choco install ghostscript --version=10.3.1
38-
- path c:\nasm-2.16.03;C:\Program Files\gs\gs10.00.0\bin;%PATH%
38+
- path c:\nasm-2.16.03;C:\Program Files\gs\gs10.03.1\bin;%PATH%
3939
- cd c:\pillow\winbuild\
4040
- ps: |
4141
c:\python38\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\

.github/workflows/macos-install.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ brew install \
77
ghostscript \
88
libimagequant \
99
libjpeg \
10-
libraqm \
1110
libtiff \
1211
little-cms2 \
1312
openjpeg \
1413
webp
14+
if [[ "$ImageOS" == "macos13" ]]; then
15+
brew install --ignore-dependencies libraqm
16+
else
17+
brew install libraqm
18+
fi
1519
export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig"
1620

1721
# TODO Update condition when cffi supports 3.13

.readthedocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
formats: [pdf]
44

55
build:
6-
os: ubuntu-22.04
6+
os: ubuntu-lts-latest
77
tools:
88
python: "3"
99
jobs:

0 commit comments

Comments
 (0)