From 15af3c73b6d638c25376f95e4c2ba9c286f441f8 Mon Sep 17 00:00:00 2001 From: Hugo Date: Thu, 31 Oct 2019 11:19:58 +0200 Subject: [PATCH 1/2] Add support for Fedora 31 --- .travis.yml | 4 ++++ fedora-31-amd64/Dockerfile | 25 +++++++++++++++++++++++++ fedora-31-amd64/Makefile | 1 + fedora-31-amd64/test.sh | 6 ++++++ fedora-31-amd64/update.sh | 2 ++ 5 files changed, 38 insertions(+) create mode 100644 fedora-31-amd64/Dockerfile create mode 120000 fedora-31-amd64/Makefile create mode 100755 fedora-31-amd64/test.sh create mode 100755 fedora-31-amd64/update.sh diff --git a/.travis.yml b/.travis.yml index 509abd0f..b4bb87c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,8 @@ matrix: env: DOCKER="centos-7-amd64" - name: "fedora-30-amd64 stable" env: DOCKER="fedora-30-amd64" + - name: "fedora-31-amd64 stable" + env: DOCKER="fedora-31-amd64" - name: "ubuntu-16.04-xenial-amd64 stable" env: DOCKER="ubuntu-16.04-xenial-amd64" - name: "ubuntu-18.04-bionic-amd64 stable" @@ -43,6 +45,8 @@ matrix: env: DOCKER="centos-7-amd64" LATEST="true" - name: "fedora-30-amd64 latest" env: DOCKER="fedora-30-amd64" LATEST="true" + - name: "fedora-31-amd64 latest" + env: DOCKER="fedora-31-amd64" LATEST="true" - name: "ubuntu-16.04-xenial-amd64 latest" env: DOCKER="ubuntu-16.04-xenial-amd64" LATEST="true" - name: "ubuntu-18.04-bionic-amd64 latest" diff --git a/fedora-31-amd64/Dockerfile b/fedora-31-amd64/Dockerfile new file mode 100644 index 00000000..d2b6483c --- /dev/null +++ b/fedora-31-amd64/Dockerfile @@ -0,0 +1,25 @@ +FROM fedora:31 + +RUN dnf install -y redhat-rpm-config \ + python3-devel python3-virtualenv make gcc \ + libtiff-devel libjpeg-devel zlib-devel freetype-devel \ + lcms2-devel libwebp-devel openjpeg2-devel python3-tkinter \ + tcl-devel tk-devel harfbuzz-devel fribidi-devel libraqm-devel \ + libimagequant-devel \ + xorg-x11-server-Xvfb which + +RUN useradd pillow && \ + chown pillow:pillow /home/pillow + +RUN /usr/bin/python3.7 /usr/lib/python3.7/site-packages/virtualenv.py --system-site-packages /vpy3 && \ + /vpy3/bin/pip install --upgrade pip && \ + /vpy3/bin/pip install cffi olefile pytest pytest-cov && \ + /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 $TRAVIS_BUILD_DIR:/Pillow pythonpillow/fedora-31-amd64 diff --git a/fedora-31-amd64/Makefile b/fedora-31-amd64/Makefile new file mode 120000 index 00000000..5e7b0e26 --- /dev/null +++ b/fedora-31-amd64/Makefile @@ -0,0 +1 @@ +../Makefile.sub \ No newline at end of file diff --git a/fedora-31-amd64/test.sh b/fedora-31-amd64/test.sh new file mode 100755 index 00000000..815f05fe --- /dev/null +++ b/fedora-31-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 pytest -vx --cov PIL --cov-report term Tests diff --git a/fedora-31-amd64/update.sh b/fedora-31-amd64/update.sh new file mode 100755 index 00000000..7fbfc796 --- /dev/null +++ b/fedora-31-amd64/update.sh @@ -0,0 +1,2 @@ +#!/bin/sh +docker pull fedora:31 From 862e77304908d3f96a09a790dee5b920bdc10e6c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 31 Oct 2019 21:50:26 +1100 Subject: [PATCH 2/2] Added Fedora 31 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2d3cbc8b..71d6db2a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -TARGETS = alpine arch amazon-1-amd64 amazon-2-amd64 ubuntu-16.04-xenial-amd64 ubuntu-18.04-bionic-amd64 debian-stretch-x86 fedora-30-amd64 centos-6-amd64 centos-7-amd64 +TARGETS = alpine arch amazon-1-amd64 amazon-2-amd64 ubuntu-16.04-xenial-amd64 ubuntu-18.04-bionic-amd64 debian-stretch-x86 fedora-30-amd64 fedora-31-amd64 centos-6-amd64 centos-7-amd64 BUILDDIRS = $(TARGETS:%=build-%)