Skip to content

Commit

Permalink
Merge pull request #203 from radarhere/fedora
Browse files Browse the repository at this point in the history
Archived Fedora 38 and added Fedora 40
  • Loading branch information
hugovk committed Apr 25, 2024
2 parents ea330d5 + fc3109a commit 7386fe5
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
- "debian-11-bullseye-amd64"
- "debian-12-bookworm-x86"
- "debian-12-bookworm-amd64"
- "fedora-38-amd64"
- "fedora-39-amd64"
- "fedora-40-amd64"
- "gentoo"
- "ubuntu-20.04-focal-amd64"
- "ubuntu-22.04-jammy-amd64-valgrind"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ TARGETS = \
debian-11-bullseye-amd64 \
debian-12-bookworm-x86 \
debian-12-bookworm-amd64 \
fedora-38-amd64 \
fedora-39-amd64 \
fedora-40-amd64 \
gentoo \
manylinux2014-wheel-build \
manylinux_2_28-wheel-build \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
42 changes: 42 additions & 0 deletions fedora-40-amd64/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
FROM fedora:40

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.12 --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-40-amd64
1 change: 1 addition & 0 deletions fedora-40-amd64/Makefile
7 changes: 7 additions & 0 deletions fedora-40-amd64/test.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions fedora-40-amd64/update.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
docker pull fedora:40

0 comments on commit 7386fe5

Please sign in to comment.