Attempt to fix Github action.

Author: mmulqueen

.github/workflows/python-qa.yml

@@ -30,7 +30,7 @@ jobs:
       uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
     - name: Install system dependencies
       run: |
-        sudo apt-get update && sudo apt-get install -y dmtx-utils zbar-tools imagemagick librsvg2-bin
+        sudo apt-get update && sudo apt-get install -y dmtx-utils zbar-tools imagemagick librsvg2-bin ghostscript
     - name: Install Python dependencies
       run: uv sync --frozen --group dev
     - name: Lint with ruff

.github/workflows/python-release.yml

@@ -28,7 +28,7 @@ jobs:
       uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
     - name: Install system dependencies
       run: |
-        sudo apt-get update && sudo apt-get install -y dmtx-utils zbar-tools imagemagick librsvg2-bin
+        sudo apt-get update && sudo apt-get install -y dmtx-utils zbar-tools imagemagick librsvg2-bin ghostscript
     - name: Install Python dependencies
       run: uv sync --frozen --group dev
     - name: Lint with ruff

pystrich/conftest.py

@@ -44,9 +44,9 @@ def _read(
 
 @pytest.fixture
 def svg_to_png():
-    path = which("convert")
+    path = which("rsvg-convert")
     if not path:
-        pytest.skip("ImageMagick `convert` not installed")
+        pytest.skip("librsvg `rsvg-convert` not installed")
 
     def _convert(
         svg_path: "str | os.PathLike[str]",
@@ -55,14 +55,12 @@ def _convert(
         subprocess.check_call(
             [
                 path,
-                "-background",
-                "white",
-                "-alpha",
-                "remove",
-                "-density",
-                "150",
-                os.fspath(svg_path),
+                "--background-color=white",
+                "--dpi-x=150",
+                "--dpi-y=150",
+                "--output",
                 os.fspath(png_path),
+                os.fspath(svg_path),
             ]
         )
 

scripts/test-python-versions.Dockerfile

@@ -1,16 +1,27 @@
 ARG PYTHON_VERSION=3.13
-FROM ghcr.io/astral-sh/uv:python${PYTHON_VERSION}-trixie-slim
+# uv binary, pulled from the upstream image so we don't curl-install at build time.
+FROM ghcr.io/astral-sh/uv:0.9 AS uv
+
+FROM ubuntu:24.04
+
+COPY --from=uv /uv /uvx /usr/local/bin/
 
 LABEL org.opencontainers.image.title=pystrich-test
 
+ARG PYTHON_VERSION
 ENV UV_LINK_MODE=copy \
     UV_COMPILE_BYTECODE=1 \
-    UV_PROJECT_ENVIRONMENT=/opt/venv
+    UV_PROJECT_ENVIRONMENT=/opt/venv \
+    UV_PYTHON=${PYTHON_VERSION} \
+    DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
- && apt-get install -y --no-install-recommends dmtx-utils zbar-tools imagemagick librsvg2-bin ghostscript \
+ && apt-get install -y --no-install-recommends \
+        ca-certificates dmtx-utils zbar-tools imagemagick librsvg2-bin ghostscript \
  && rm -rf /var/lib/apt/lists/*
 
+RUN uv python install ${PYTHON_VERSION}
+
 WORKDIR /src
 
 # Install dependencies first so the layer can be cached across source edits.
@@ -20,4 +31,4 @@ RUN uv sync --frozen --no-install-project --group dev
 COPY . .
 RUN uv sync --frozen --group dev
 
-CMD ["uv", "run", "--frozen", "pytest"]
+CMD ["uv", "run", "--frozen", "pytest"]