From 654729aede259fce22c1a031810614351584f551 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 11 Sep 2024 08:32:19 +1000 Subject: [PATCH] Removed cffi --- amazon-2-amd64/Dockerfile | 3 +-- amazon-2023-amd64/Dockerfile | 3 +-- arch/Dockerfile | 3 +-- centos-stream-9-amd64/Dockerfile | 3 +-- debian-12-bookworm-amd64/Dockerfile | 3 +-- debian-12-bookworm-x86/Dockerfile | 3 +-- fedora-39-amd64/Dockerfile | 2 +- fedora-40-amd64/Dockerfile | 2 +- gentoo/Dockerfile | 2 +- ubuntu-22.04-jammy-amd64-valgrind/Dockerfile | 3 +-- ubuntu-22.04-jammy-amd64/Dockerfile | 3 +-- ubuntu-22.04-jammy-arm64v8/Dockerfile | 3 +-- ubuntu-24.04-noble-amd64/Dockerfile | 3 +-- ubuntu-24.04-noble-ppc64le/Dockerfile | 3 +-- ubuntu-24.04-noble-s390x/Dockerfile | 3 +-- 15 files changed, 15 insertions(+), 27 deletions(-) diff --git a/amazon-2-amd64/Dockerfile b/amazon-2-amd64/Dockerfile index 2c7c258d..8d05d8b4 100644 --- a/amazon-2-amd64/Dockerfile +++ b/amazon-2-amd64/Dockerfile @@ -12,7 +12,6 @@ RUN yum install -y \ git \ harfbuzz-devel \ lcms2-devel \ - libffi-devel \ libjpeg-devel \ libtiff-devel \ make \ @@ -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" diff --git a/amazon-2023-amd64/Dockerfile b/amazon-2023-amd64/Dockerfile index 6af19ed2..bfc7b9f6 100644 --- a/amazon-2023-amd64/Dockerfile +++ b/amazon-2023-amd64/Dockerfile @@ -11,7 +11,6 @@ RUN yum install -y \ git \ harfbuzz-devel \ lcms2-devel \ - libffi-devel \ libjpeg-devel \ libtiff-devel \ make \ @@ -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" diff --git a/arch/Dockerfile b/arch/Dockerfile index 8411bf68..a031e237 100644 --- a/arch/Dockerfile +++ b/arch/Dockerfile @@ -23,7 +23,6 @@ RUN pacman -Sy --noconfirm \ gcc \ ghostscript \ git \ - libffi \ make \ mesa-libgl \ meson \ @@ -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 diff --git a/centos-stream-9-amd64/Dockerfile b/centos-stream-9-amd64/Dockerfile index adacbf62..9afc0995 100644 --- a/centos-stream-9-amd64/Dockerfile +++ b/centos-stream-9-amd64/Dockerfile @@ -13,7 +13,6 @@ RUN yum install -y \ ghostscript \ git \ lcms2-devel \ - libffi-devel \ libjpeg-devel \ libtiff-devel \ libwebp-devel \ @@ -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" diff --git a/debian-12-bookworm-amd64/Dockerfile b/debian-12-bookworm-amd64/Dockerfile index 36c1e064..de5b0553 100644 --- a/debian-12-bookworm-amd64/Dockerfile +++ b/debian-12-bookworm-amd64/Dockerfile @@ -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 \ @@ -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 diff --git a/debian-12-bookworm-x86/Dockerfile b/debian-12-bookworm-x86/Dockerfile index 33a1d28d..66c6e23f 100644 --- a/debian-12-bookworm-x86/Dockerfile +++ b/debian-12-bookworm-x86/Dockerfile @@ -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 \ @@ -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 diff --git a/fedora-39-amd64/Dockerfile b/fedora-39-amd64/Dockerfile index b0247ea3..d13724b4 100644 --- a/fedora-39-amd64/Dockerfile +++ b/fedora-39-amd64/Dockerfile @@ -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 diff --git a/fedora-40-amd64/Dockerfile b/fedora-40-amd64/Dockerfile index a2afb2e0..fc9922c4 100644 --- a/fedora-40-amd64/Dockerfile +++ b/fedora-40-amd64/Dockerfile @@ -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 diff --git a/gentoo/Dockerfile b/gentoo/Dockerfile index 8e0e2e93..23c3285d 100644 --- a/gentoo/Dockerfile +++ b/gentoo/Dockerfile @@ -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 diff --git a/ubuntu-22.04-jammy-amd64-valgrind/Dockerfile b/ubuntu-22.04-jammy-amd64-valgrind/Dockerfile index d1b0294a..b1e3dd31 100644 --- a/ubuntu-22.04-jammy-amd64-valgrind/Dockerfile +++ b/ubuntu-22.04-jammy-amd64-valgrind/Dockerfile @@ -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 \ @@ -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 diff --git a/ubuntu-22.04-jammy-amd64/Dockerfile b/ubuntu-22.04-jammy-amd64/Dockerfile index d00d44c4..5c9180aa 100644 --- a/ubuntu-22.04-jammy-amd64/Dockerfile +++ b/ubuntu-22.04-jammy-amd64/Dockerfile @@ -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 \ @@ -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 diff --git a/ubuntu-22.04-jammy-arm64v8/Dockerfile b/ubuntu-22.04-jammy-arm64v8/Dockerfile index bb0bbd21..00b51042 100644 --- a/ubuntu-22.04-jammy-arm64v8/Dockerfile +++ b/ubuntu-22.04-jammy-arm64v8/Dockerfile @@ -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 \ @@ -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 diff --git a/ubuntu-24.04-noble-amd64/Dockerfile b/ubuntu-24.04-noble-amd64/Dockerfile index 6966bc96..a06e7b91 100644 --- a/ubuntu-24.04-noble-amd64/Dockerfile +++ b/ubuntu-24.04-noble-amd64/Dockerfile @@ -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 \ @@ -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 diff --git a/ubuntu-24.04-noble-ppc64le/Dockerfile b/ubuntu-24.04-noble-ppc64le/Dockerfile index 714c4648..04612da1 100644 --- a/ubuntu-24.04-noble-ppc64le/Dockerfile +++ b/ubuntu-24.04-noble-ppc64le/Dockerfile @@ -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 \ @@ -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 diff --git a/ubuntu-24.04-noble-s390x/Dockerfile b/ubuntu-24.04-noble-s390x/Dockerfile index 6396cf02..8bedef10 100644 --- a/ubuntu-24.04-noble-s390x/Dockerfile +++ b/ubuntu-24.04-noble-s390x/Dockerfile @@ -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 \ @@ -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