From 7462e8115c5ffc950d35536e618e1ac023c5e0f4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 22 Apr 2023 21:49:24 +1000 Subject: [PATCH] Added Fedora 38 --- .github/workflows/build.yml | 1 + Makefile | 1 + fedora-38-amd64/Dockerfile | 42 +++++++++++++++++++++++++++++++++++++ fedora-38-amd64/Makefile | 1 + fedora-38-amd64/test.sh | 7 +++++++ fedora-38-amd64/update.sh | 2 ++ 6 files changed, 54 insertions(+) create mode 100644 fedora-38-amd64/Dockerfile create mode 120000 fedora-38-amd64/Makefile create mode 100755 fedora-38-amd64/test.sh create mode 100755 fedora-38-amd64/update.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 030ef477..09f0a39c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,7 @@ jobs: - "centos-stream-9-amd64" - "debian-11-bullseye-x86" - "fedora-37-amd64" + - "fedora-38-amd64" - "gentoo" - "ubuntu-18.04-bionic-amd64" - "ubuntu-20.04-focal-amd64" diff --git a/Makefile b/Makefile index 4e929654..286dfce9 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ TARGETS = \ centos-stream-9-amd64 \ debian-11-bullseye-x86 \ fedora-37-amd64 \ + fedora-38-amd64 \ gentoo \ manylinux2014-wheel-build \ ubuntu-18.04-bionic-amd64 \ diff --git a/fedora-38-amd64/Dockerfile b/fedora-38-amd64/Dockerfile new file mode 100644 index 00000000..9e469a70 --- /dev/null +++ b/fedora-38-amd64/Dockerfile @@ -0,0 +1,42 @@ +FROM fedora:38 + +RUN dnf install -y \ + freetype-devel \ + fribidi-devel \ + gcc \ + harfbuzz-devel \ + lcms2-devel \ + libimagequant-devel \ + libjpeg-devel \ + libraqm-devel \ + libtiff-devel \ + libwebp-devel \ + make \ + openjpeg2-devel \ + python3-devel \ + python3-tkinter \ + python3-virtualenv \ + redhat-rpm-config \ + tcl-devel \ + tk-devel \ + util-linux \ + which \ + xorg-x11-server-Xvfb \ + zlib-devel \ + && dnf clean all + +RUN useradd pillow \ + && chown pillow:pillow /home/pillow + +RUN virtualenv -p /usr/bin/python3.11 --system-site-packages /vpy3 \ + && /vpy3/bin/pip install --no-cache-dir --upgrade pip \ + && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov pytest-timeout \ + && /vpy3/bin/pip install --no-cache-dir numpy --only-binary=:all: || true \ + && chown -R pillow:pillow /vpy3 + +ADD depends /depends + +USER pillow +CMD ["depends/test.sh"] + +#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/fedora-38-amd64 diff --git a/fedora-38-amd64/Makefile b/fedora-38-amd64/Makefile new file mode 120000 index 00000000..5e7b0e26 --- /dev/null +++ b/fedora-38-amd64/Makefile @@ -0,0 +1 @@ +../Makefile.sub \ No newline at end of file diff --git a/fedora-38-amd64/test.sh b/fedora-38-amd64/test.sh new file mode 100755 index 00000000..f1b1726c --- /dev/null +++ b/fedora-38-amd64/test.sh @@ -0,0 +1,7 @@ +#!/bin/bash +source /vpy3/bin/activate +cd /Pillow +make clean +make install-coverage +python3 -c "from PIL import Image" +/usr/bin/xvfb-run -a pytest -vx --cov PIL --cov-report term Tests diff --git a/fedora-38-amd64/update.sh b/fedora-38-amd64/update.sh new file mode 100755 index 00000000..21201375 --- /dev/null +++ b/fedora-38-amd64/update.sh @@ -0,0 +1,2 @@ +#!/bin/sh +docker pull fedora:38