Skip to content

Commit

Permalink
Removed cffi
Browse files Browse the repository at this point in the history
  • Loading branch information
@radarhere
radarhere committed Sep 10, 2024
1 parent 0d6502d commit 654729a
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 27 deletions.
3 changes: 1 addition & 2 deletions amazon-2-amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ RUN yum install -y \
git \
harfbuzz-devel \
lcms2-devel \
libffi-devel \
libjpeg-devel \
libtiff-devel \
make \
Expand Down Expand Up @@ -51,7 +50,7 @@ ARG PIP_NO_CACHE_DIR=1
RUN bash -c "python3.9 -m pip install virtualenv \
&& python3.9 -m virtualenv --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install numpy --only-binary=:all: || true \
&& chown -R pillow:pillow /vpy3"

Expand Down
3 changes: 1 addition & 2 deletions amazon-2023-amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN yum install -y \
git \
harfbuzz-devel \
lcms2-devel \
libffi-devel \
libjpeg-devel \
libtiff-devel \
make \
Expand Down Expand Up @@ -44,7 +43,7 @@ ARG PIP_NO_CACHE_DIR=1
RUN bash -c "/usr/bin/pip3 install virtualenv \
&& /usr/bin/python3 -mvirtualenv -p /usr/bin/python3 --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install numpy --only-binary=:all: || true \
&& chown -R pillow:pillow /vpy3"

Expand Down
3 changes: 1 addition & 2 deletions arch/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ RUN pacman -Sy --noconfirm \
gcc \
ghostscript \
git \
libffi \
make \
mesa-libgl \
meson \
Expand All @@ -47,7 +46,7 @@ ARG PIP_NO_CACHE_DIR=1
RUN /sbin/useradd -m -U --uid 1001 pillow \
&& virtualenv --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install numpy --only-binary=:all: || true \
&& chown -R pillow:pillow /vpy3

Expand Down
3 changes: 1 addition & 2 deletions centos-stream-9-amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ RUN yum install -y \
ghostscript \
git \
lcms2-devel \
libffi-devel \
libjpeg-devel \
libtiff-devel \
libwebp-devel \
Expand Down Expand Up @@ -41,7 +40,7 @@ ARG PIP_NO_CACHE_DIR=1
RUN bash -c "python3.9 -m pip install virtualenv \
&& python3.9 -m virtualenv --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install numpy --only-binary=:all: || true \
&& chown -R pillow:pillow /vpy3"

Expand Down
3 changes: 1 addition & 2 deletions debian-12-bookworm-amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
curl \
ghostscript \
git \
libffi-dev \
libfreetype6-dev \
libfribidi-dev \
libharfbuzz-dev \
Expand Down Expand Up @@ -74,7 +73,7 @@ ARG PIP_NO_CACHE_DIR=1

RUN virtualenv -p /usr/bin/python3.11 --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
&& chown -R pillow:pillow /vpy3

ADD depends /depends
Expand Down
3 changes: 1 addition & 2 deletions debian-12-bookworm-x86/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
curl \
ghostscript \
git \
libffi-dev \
libfreetype6-dev \
libfribidi-dev \
libharfbuzz-dev \
Expand Down Expand Up @@ -74,7 +73,7 @@ ARG PIP_NO_CACHE_DIR=1

RUN virtualenv -p /usr/bin/python3.11 --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
&& chown -R pillow:pillow /vpy3

ADD depends /depends
Expand Down
2 changes: 1 addition & 1 deletion fedora-39-amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ARG PIP_NO_CACHE_DIR=1

RUN virtualenv -p /usr/bin/python3.12 --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install numpy --only-binary=:all: || true \
&& chown -R pillow:pillow /vpy3

Expand Down
2 changes: 1 addition & 1 deletion fedora-40-amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ARG PIP_NO_CACHE_DIR=1

RUN virtualenv -p /usr/bin/python3.12 --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install numpy --only-binary=:all: || true \
&& chown -R pillow:pillow /vpy3

Expand Down
2 changes: 1 addition & 1 deletion gentoo/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ARG PIP_NO_CACHE_DIR=1

RUN virtualenv --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi pytest-cov pytest-timeout \
&& /vpy3/bin/pip install pytest-cov pytest-timeout \
&& chown -R pillow:pillow /vpy3

ADD depends /depends
Expand Down
3 changes: 1 addition & 2 deletions ubuntu-22.04-jammy-amd64-valgrind/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
cmake \
ghostscript \
git \
libffi-dev \
libfreetype6-dev \
libfribidi-dev \
libharfbuzz-dev \
Expand Down Expand Up @@ -43,7 +42,7 @@ ARG PIP_NO_CACHE_DIR=1

RUN virtualenv -p /usr/bin/python3.10-dbg --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi olefile pytest pytest-cov pytest-timeout pytest-valgrind \
&& /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout pytest-valgrind \
&& chown -R pillow:pillow /vpy3

ADD depends /depends
Expand Down
3 changes: 1 addition & 2 deletions ubuntu-22.04-jammy-amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
ghostscript \
git \
libegl-dev \
libffi-dev \
libfreetype6-dev \
libfribidi-dev \
libharfbuzz-dev \
Expand Down Expand Up @@ -50,7 +49,7 @@ ARG PIP_NO_CACHE_DIR=1

RUN virtualenv -p /usr/bin/python3.10 --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi olefile pyside6 pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install olefile pyside6 pytest pytest-cov pytest-timeout \
&& chown -R pillow:pillow /vpy3

ADD depends /depends
Expand Down
3 changes: 1 addition & 2 deletions ubuntu-22.04-jammy-arm64v8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
cmake \
ghostscript \
git \
libffi-dev \
libfreetype6-dev \
libfribidi-dev \
libharfbuzz-dev \
Expand Down Expand Up @@ -41,7 +40,7 @@ ARG PIP_NO_CACHE_DIR=1

RUN virtualenv -p /usr/bin/python3.10 --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
&& chown -R pillow:pillow /vpy3

ADD depends /depends
Expand Down
3 changes: 1 addition & 2 deletions ubuntu-24.04-noble-amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
ghostscript \
git \
libegl-dev \
libffi-dev \
libfreetype6-dev \
libfribidi-dev \
libharfbuzz-dev \
Expand Down Expand Up @@ -50,7 +49,7 @@ ARG PIP_NO_CACHE_DIR=1

RUN virtualenv -p /usr/bin/python3.12 --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi olefile pyside6 pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install olefile pyside6 pytest pytest-cov pytest-timeout \
&& chown -R pillow:pillow /vpy3

ADD depends /depends
Expand Down
3 changes: 1 addition & 2 deletions ubuntu-24.04-noble-ppc64le/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
cmake \
ghostscript \
git \
libffi-dev \
libfreetype6-dev \
libfribidi-dev \
libharfbuzz-dev \
Expand Down Expand Up @@ -40,7 +39,7 @@ ARG PIP_NO_CACHE_DIR=1

RUN virtualenv -p /usr/bin/python3.12 --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
&& chown -R pillow:pillow /vpy3

ADD depends /depends
Expand Down
3 changes: 1 addition & 2 deletions ubuntu-24.04-noble-s390x/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
cmake \
ghostscript \
git \
libffi-dev \
libfreetype6-dev \
libfribidi-dev \
libharfbuzz-dev \
Expand Down Expand Up @@ -38,7 +37,7 @@ ARG PIP_NO_CACHE_DIR=1

RUN virtualenv -p /usr/bin/python3.12 --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install cffi olefile pytest pytest-cov pytest-timeout \
&& /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
&& chown -R pillow:pillow /vpy3

ADD depends /depends
Expand Down

0 comments on commit 654729a

Please sign in to comment.