Skip to content

Use Resolute #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hugovk merged 3 commits into from
Apr 25, 2026
Merged

Use Resolute #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebd37f4
Renamed plucky to resolute
radarhere Apr 25, 2026
9798ceb
Rearranged targets
radarhere Apr 25, 2026
97b5e6a
Updated Python to 3.14
radarhere Apr 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
# Run slower jobs first to give them a headstart and reduce waiting time
- "ubuntu-24.04-noble-ppc64le"
- "ubuntu-24.04-noble-s390x"
- "ubuntu-26.04-plucky-ppc64le"
- "ubuntu-26.04-plucky-s390x"
- "ubuntu-26.04-resolute-ppc64le"
- "ubuntu-26.04-resolute-s390x"
# test image for manylinux-wheel build
- "fedora-43-amd64"
# Then run the remainder
Expand All @@ -37,7 +37,7 @@ jobs:
- "ubuntu-22.04-jammy-amd64"
- "ubuntu-22.04-jammy-amd64-valgrind"
- "ubuntu-24.04-noble-amd64"
- "ubuntu-26.04-plucky-amd64"
- "ubuntu-26.04-resolute-amd64"
# has a dependency on the test image
- "manylinux_2_28-wheel-build"
include:
Expand All @@ -51,13 +51,13 @@ jobs:
docker-args: "--platform linux/s390x"
- image: "ubuntu-24.04-noble-arm64v8"
os: "ubuntu-24.04-arm"
- image: "ubuntu-26.04-plucky-ppc64le"
- image: "ubuntu-26.04-resolute-ppc64le"
qemu-arch: "ppc64le"
docker-args: "--platform linux/ppc64le"
- image: "ubuntu-26.04-plucky-s390x"
- image: "ubuntu-26.04-resolute-s390x"
qemu-arch: "s390x"
docker-args: "--platform linux/s390x"
- image: "ubuntu-26.04-plucky-arm64v8"
- image: "ubuntu-26.04-resolute-arm64v8"
os: "ubuntu-24.04-arm"

steps:
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ TARGETS = \
manylinux_2_28-wheel-build \
ubuntu-22.04-jammy-amd64 \
ubuntu-24.04-noble-amd64 \
ubuntu-26.04-resolute-amd64 \
ubuntu-22.04-jammy-amd64-valgrind \
ubuntu-24.04-noble-arm64v8 \
ubuntu-24.04-noble-ppc64le \
ubuntu-24.04-noble-s390x \
ubuntu-26.04-plucky-amd64 \
ubuntu-26.04-plucky-arm64v8 \
ubuntu-26.04-plucky-ppc64le \
ubuntu-26.04-plucky-s390x
ubuntu-26.04-resolute-arm64v8 \
ubuntu-26.04-resolute-ppc64le \
ubuntu-26.04-resolute-s390x

BUILDDIRS = $(TARGETS:%=build-%)
PUSHDIRS = $(TARGETS:%=push-%)
Expand Down
2 changes: 0 additions & 2 deletions ubuntu-26.04-plucky-amd64/update.sh
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ubuntu-26.04-plucky-arm64v8/update.sh
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ubuntu-26.04-plucky-ppc64le/update.sh
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ubuntu-26.04-plucky-s390x/update.sh
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ubuntu-26.04-plucky-amd64/Dockerfile → ubuntu-26.04-resolute-amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:plucky
FROM ubuntu:resolute

RUN apt-get -qq update \
&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
Expand Down Expand Up @@ -49,7 +49,7 @@ RUN useradd pillow \
ARG PIP_DISABLE_PIP_VERSION_CHECK=1
ARG PIP_NO_CACHE_DIR=1

RUN virtualenv -p /usr/bin/python3.13 --system-site-packages /vpy3 \
RUN virtualenv -p /usr/bin/python3.14 --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install olefile pyside6 pytest pytest-cov pytest-timeout \
&& chown -R pillow:pillow /vpy3
Expand All @@ -63,4 +63,4 @@ ENV FORCE_COLOR=1
USER pillow
CMD ["depends/test.sh"]

#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-plucky-amd64
#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-resolute-amd64
0 ubuntu-26.04-plucky-amd64/Makefile → ubuntu-26.04-resolute-amd64/Makefile
View file
Open in desktop
File renamed without changes.
0 ubuntu-26.04-plucky-amd64/test.sh → ubuntu-26.04-resolute-amd64/test.sh
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions ubuntu-26.04-resolute-amd64/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
docker pull ubuntu:resolute
6 changes: 3 additions & 3 deletions ubuntu-26.04-plucky-arm64v8/Dockerfile → ubuntu-26.04-resolute-arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM arm64v8/ubuntu:plucky
FROM arm64v8/ubuntu:resolute

RUN apt-get -qq update \
&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
Expand Down Expand Up @@ -49,7 +49,7 @@ RUN useradd pillow \
ARG PIP_DISABLE_PIP_VERSION_CHECK=1
ARG PIP_NO_CACHE_DIR=1

RUN virtualenv -p /usr/bin/python3.13 --system-site-packages /vpy3 \
RUN virtualenv -p /usr/bin/python3.14 --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install olefile pyside6 pytest pytest-cov pytest-timeout \
&& chown -R pillow:pillow /vpy3
Expand All @@ -63,4 +63,4 @@ ENV FORCE_COLOR=1
USER pillow
CMD ["depends/test.sh"]

#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-plucky-arm64v8
#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-resolute-arm64v8
0 ubuntu-26.04-plucky-arm64v8/Makefile → ubuntu-26.04-resolute-arm64v8/Makefile
View file
Open in desktop
File renamed without changes.
0 ubuntu-26.04-plucky-arm64v8/test.sh → ubuntu-26.04-resolute-arm64v8/test.sh
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions ubuntu-26.04-resolute-arm64v8/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
docker pull arm64v8/ubuntu:resolute
6 changes: 3 additions & 3 deletions ubuntu-26.04-plucky-ppc64le/Dockerfile → ubuntu-26.04-resolute-ppc64le/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ppc64le/ubuntu:plucky
FROM ppc64le/ubuntu:resolute

RUN apt-get -qq update \
&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
Expand Down Expand Up @@ -39,7 +39,7 @@ RUN useradd pillow \
ARG PIP_DISABLE_PIP_VERSION_CHECK=1
ARG PIP_NO_CACHE_DIR=1

RUN virtualenv -p /usr/bin/python3.13 --system-site-packages /vpy3 \
RUN virtualenv -p /usr/bin/python3.14 --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
&& chown -R pillow:pillow /vpy3
Expand All @@ -53,4 +53,4 @@ ENV FORCE_COLOR=1
USER pillow
CMD ["depends/test.sh"]

#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-plucky-ppc64le
#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-resolute-ppc64le
0 ubuntu-26.04-plucky-ppc64le/Makefile → ubuntu-26.04-resolute-ppc64le/Makefile
View file
Open in desktop
File renamed without changes.
0 ubuntu-26.04-plucky-ppc64le/test.sh → ubuntu-26.04-resolute-ppc64le/test.sh
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions ubuntu-26.04-resolute-ppc64le/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
docker pull $DOCKER_ARGS ppc64le/ubuntu:resolute
6 changes: 3 additions & 3 deletions ubuntu-26.04-plucky-s390x/Dockerfile → ubuntu-26.04-resolute-s390x/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM s390x/ubuntu:plucky
FROM s390x/ubuntu:resolute

RUN apt-get -qq update \
&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
Expand Down Expand Up @@ -37,7 +37,7 @@ RUN useradd pillow \
ARG PIP_DISABLE_PIP_VERSION_CHECK=1
ARG PIP_NO_CACHE_DIR=1

RUN virtualenv -p /usr/bin/python3.13 --system-site-packages /vpy3 \
RUN virtualenv -p /usr/bin/python3.14 --system-site-packages /vpy3 \
&& /vpy3/bin/pip install --upgrade pip \
&& /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
&& chown -R pillow:pillow /vpy3
Expand All @@ -53,4 +53,4 @@ ENV LD_LIBRARY_PATH=/usr/lib
USER pillow
CMD ["depends/test.sh"]

#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-plucky-s390x
#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-26.04-resolute-s390x
0 ubuntu-26.04-plucky-s390x/Makefile → ubuntu-26.04-resolute-s390x/Makefile
View file
Open in desktop
File renamed without changes.
0 ubuntu-26.04-plucky-s390x/test.sh → ubuntu-26.04-resolute-s390x/test.sh
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions ubuntu-26.04-resolute-s390x/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
docker pull $DOCKER_ARGS s390x/ubuntu:resolute