From e1cebe4fbb039cacb5614185028b43c39eb9521f Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Wed, 21 Oct 2020 20:02:10 +0300
Subject: [PATCH 1/2] Add Fedora 33

---
 .travis.yml                |  4 ++++
 Makefile                   | 15 ++++++++++++--
 fedora-33-amd64/Dockerfile | 41 ++++++++++++++++++++++++++++++++++++++
 fedora-33-amd64/Makefile   |  1 +
 fedora-33-amd64/test.sh    |  6 ++++++
 fedora-33-amd64/update.sh  |  2 ++
 6 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 fedora-33-amd64/Dockerfile
 create mode 120000 fedora-33-amd64/Makefile
 create mode 100755 fedora-33-amd64/test.sh
 create mode 100755 fedora-33-amd64/update.sh

diff --git a/.travis.yml b/.travis.yml
index 0184c277..46701137 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,8 @@ matrix:
       env: DOCKER="debian-10-buster-x86"
     - name: "stable + fedora-32-amd64"
       env: DOCKER="fedora-32-amd64"
+    - name: "stable + fedora-33-amd64"
+      env: DOCKER="fedora-33-amd64"
     - name: "stable + ubuntu-18.04-bionic-amd64"
       env: DOCKER="ubuntu-18.04-bionic-amd64"
     - name: "stable + ubuntu-20.04-focal-amd64"
@@ -48,6 +50,8 @@ matrix:
       env: DOCKER="debian-10-buster-x86" LATEST="true"
     - name: "latest + fedora-32-amd64"
       env: DOCKER="fedora-32-amd64" LATEST="true"
+    - name: "latest + fedora-33-amd64"
+      env: DOCKER="fedora-33-amd64" LATEST="true"
     - name: "latest + ubuntu-18.04-bionic-amd64"
       env: DOCKER="ubuntu-18.04-bionic-amd64" LATEST="true"
     - name: "latest + ubuntu-20.04-focal-amd64"
diff --git a/Makefile b/Makefile
index 1ee40f36..21b27c79 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,16 @@
-TARGETS = alpine arch amazon-1-amd64 amazon-2-amd64 ubuntu-18.04-bionic-amd64 ubuntu-20.04-focal-amd64 debian-10-buster-x86 fedora-32-amd64 centos-6-amd64 centos-7-amd64 centos-8-amd64
-
+TARGETS = \
+	alpine \
+	amazon-1-amd64 \
+	amazon-2-amd64 \
+	arch \
+	centos-6-amd64 \
+	centos-7-amd64 \
+	centos-8-amd64 \
+	debian-10-buster-\86 \
+	fedora-32-amd64 \
+	fedora-33-amd64 \
+	ubuntu-18.04-bionic-amd64 \
+	ubuntu-20.04-focal-amd64
 
 BUILDDIRS = $(TARGETS:%=build-%)
 PUSHDIRS = $(TARGETS:%=push-%)
diff --git a/fedora-33-amd64/Dockerfile b/fedora-33-amd64/Dockerfile
new file mode 100644
index 00000000..2d8c2867
--- /dev/null
+++ b/fedora-33-amd64/Dockerfile
@@ -0,0 +1,41 @@
+FROM fedora:33
+
+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 \
+    which \
+    xorg-x11-server-Xvfb \
+    zlib-devel \
+    && dnf clean all
+
+RUN useradd pillow \
+    && chown pillow:pillow /home/pillow
+
+RUN virtualenv -p /usr/bin/python3.9 --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-33-amd64
diff --git a/fedora-33-amd64/Makefile b/fedora-33-amd64/Makefile
new file mode 120000
index 00000000..5e7b0e26
--- /dev/null
+++ b/fedora-33-amd64/Makefile
@@ -0,0 +1 @@
+../Makefile.sub
\ No newline at end of file
diff --git a/fedora-33-amd64/test.sh b/fedora-33-amd64/test.sh
new file mode 100755
index 00000000..815f05fe
--- /dev/null
+++ b/fedora-33-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-33-amd64/update.sh b/fedora-33-amd64/update.sh
new file mode 100755
index 00000000..56343aee
--- /dev/null
+++ b/fedora-33-amd64/update.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+docker pull fedora:33

From 03353b1127877faddc9d2004aefff70e5f1afb36 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Wed, 21 Oct 2020 20:09:35 +0300
Subject: [PATCH 2/2] Upgrade setuptools

---
 fedora-33-amd64/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fedora-33-amd64/Dockerfile b/fedora-33-amd64/Dockerfile
index 2d8c2867..7a072866 100644
--- a/fedora-33-amd64/Dockerfile
+++ b/fedora-33-amd64/Dockerfile
@@ -29,6 +29,7 @@ RUN useradd pillow \
 
 RUN virtualenv -p /usr/bin/python3.9 --system-site-packages /vpy3 \
     && /vpy3/bin/pip install --upgrade pip \
+    && /vpy3/bin/pip install --upgrade setuptools>=49.3.2 \
     && /vpy3/bin/pip install cffi olefile pytest pytest-cov \
     && /vpy3/bin/pip install numpy --only-binary=:all: || true \
     && chown -R pillow:pillow /vpy3