From 45457bd7086bed6d0f458e2eb1c915b955da8ea7 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 2 Nov 2024 17:48:41 +1100 Subject: [PATCH] Added Fedora 41 --- .github/workflows/build.yml | 1 + Makefile | 1 + fedora-41-amd64/Dockerfile | 45 +++++++++++++++++++++++++++++++++++++ fedora-41-amd64/Makefile | 1 + fedora-41-amd64/test.sh | 6 +++++ fedora-41-amd64/update.sh | 2 ++ 6 files changed, 56 insertions(+) create mode 100644 fedora-41-amd64/Dockerfile create mode 120000 fedora-41-amd64/Makefile create mode 100755 fedora-41-amd64/test.sh create mode 100755 fedora-41-amd64/update.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7bd51aed..2cf27805 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,7 @@ jobs: - "debian-12-bookworm-x86" - "debian-12-bookworm-amd64" - "fedora-40-amd64" + - "fedora-41-amd64" - "gentoo" - "ubuntu-22.04-jammy-amd64" - "ubuntu-22.04-jammy-amd64-valgrind" diff --git a/Makefile b/Makefile index 63ab0cb7..3c195c94 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ TARGETS = \ debian-12-bookworm-x86 \ debian-12-bookworm-amd64 \ fedora-40-amd64 \ + fedora-41-amd64 \ gentoo \ manylinux2014-wheel-build \ manylinux_2_28-wheel-build \ diff --git a/fedora-41-amd64/Dockerfile b/fedora-41-amd64/Dockerfile new file mode 100644 index 00000000..5171b3b3 --- /dev/null +++ b/fedora-41-amd64/Dockerfile @@ -0,0 +1,45 @@ +FROM fedora:41 + +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 --uid 1001 pillow \ + && chown pillow:pillow /home/pillow + +ARG PIP_DISABLE_PIP_VERSION_CHECK=1 +ARG PIP_NO_CACHE_DIR=1 + +RUN virtualenv -p /usr/bin/python3.13 --system-site-packages /vpy3 \ + && /vpy3/bin/pip install --upgrade pip \ + && /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \ + && /vpy3/bin/pip install 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-41-amd64 diff --git a/fedora-41-amd64/Makefile b/fedora-41-amd64/Makefile new file mode 120000 index 00000000..5e7b0e26 --- /dev/null +++ b/fedora-41-amd64/Makefile @@ -0,0 +1 @@ +../Makefile.sub \ No newline at end of file diff --git a/fedora-41-amd64/test.sh b/fedora-41-amd64/test.sh new file mode 100755 index 00000000..a79cfc3d --- /dev/null +++ b/fedora-41-amd64/test.sh @@ -0,0 +1,6 @@ +#!/bin/bash +source /vpy3/bin/activate +cd /Pillow +make clean +make install-coverage +/usr/bin/xvfb-run -a .ci/test.sh diff --git a/fedora-41-amd64/update.sh b/fedora-41-amd64/update.sh new file mode 100755 index 00000000..9c1fe0d4 --- /dev/null +++ b/fedora-41-amd64/update.sh @@ -0,0 +1,2 @@ +#!/bin/sh +docker pull fedora:41