Skip to content

Commit

Permalink
Merge pull request #71 from hugovk/add-fedora-31
Browse files Browse the repository at this point in the history
Add support for Fedora 31
  • Loading branch information
radarhere committed Nov 1, 2019
2 parents 9a70a28 + 34d3442 commit 3f071f7
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .travis.yml
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion 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-%)
Expand Down
25 changes: 25 additions & 0 deletions 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
1 change: 1 addition & 0 deletions fedora-31-amd64/Makefile
6 changes: 6 additions & 0 deletions 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
2 changes: 2 additions & 0 deletions fedora-31-amd64/update.sh
@@ -0,0 +1,2 @@
#!/bin/sh
docker pull fedora:31

0 comments on commit 3f071f7

Please sign in to comment.