💥 Upgrade to trixie

Author: nikolaik

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
     hooks:
       - id: mypy
         name: mypy
-        entry: uv run mypy
+        entry: mypy
         language: python
         require_serial: true
         types: [python]

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:bookworm
+FROM python:trixie
 LABEL org.opencontainers.image.authors="Nikolai R Kristiansen <nikolaik@gmail.com>"
 
 RUN groupadd --gid 1000 pn && useradd --uid 1000 --gid pn --shell /bin/bash --create-home pn

src/docker_python_nodejs/dockerfiles.py

@@ -7,7 +7,7 @@
 
 from jinja2 import Environment, FileSystemLoader, select_autoescape
 
-from .settings import DOCKERFILES_PATH
+from .settings import DEFAULT_DISTRO, DOCKERFILES_PATH
 from .versions import BuildVersion
 
 logger = logging.getLogger("dpn")
@@ -25,7 +25,7 @@ def render_dockerfile(version: BuildVersion) -> str:
 
     context = dataclasses.asdict(version) | {
         "now": datetime.datetime.now(datetime.UTC).isoformat()[:-7],
-        "distro": "bookworm" if version.distro == "slim" else version.distro,  # slim is an image variant
+        "distro": DEFAULT_DISTRO if version.distro == "slim" else version.distro,  # slim is an image variant
         "distro_variant": "slim" if version.distro == "slim" else "full",
     }
 

src/docker_python_nodejs/settings.py

@@ -6,5 +6,5 @@
 DOCKERFILES_PATH = BASE_PATH / "dockerfiles"
 
 DEFAULT_PLATFORMS = ["linux/amd64", "linux/arm64"]
-DEFAULT_DISTRO = "bookworm"
-DISTROS = ["bookworm", "bullseye", "slim", "alpine"]
+DEFAULT_DISTRO = "trixie"
+DISTROS = ["trixie", "bookworm", "slim", "alpine"]

tests/test_all.py

@@ -26,10 +26,10 @@ def build_version_fixture() -> BuildVersion:
         key="python3.11-nodejs20",
         python="3.11",
         python_canonical="3.11.3",
-        python_image="3.11.3-bookworm",
+        python_image="3.11.3-trixie",
         nodejs="20",
         nodejs_canonical="20.2.0",
-        distro="bookworm",
+        distro="trixie",
         platforms=[
             "linux/amd64",
             "linux/arm64",
@@ -121,7 +121,7 @@ def python_tags_fixture() -> dict[str, Any]:
         "previous": None,
         "results": [
             {
-                "name": "3.11.4-bookworm",
+                "name": "3.11.4-trixie",
                 "images": [{"os": "linux", "architecture": "amd64"}, {"os": "linux", "architecture": "arm64"}],
             },
             {
@@ -194,13 +194,13 @@ def test_decide_version_combinations(
     python_version = SupportedVersion(start="2022-10-24", end="2027-10", version="3.11")
     node_version = SupportedVersion(start="2023-04-18", end="2026-04-30", version="v20")
 
-    versions = decide_version_combinations(["bookworm", "alpine"], [python_version], [node_version])
+    versions = decide_version_combinations(["trixie", "alpine"], [python_version], [node_version])
 
     assert versions
     assert len(versions) == python_tags["count"]
     assert versions[0].nodejs_canonical == "20.3.0"
     assert versions[0].python_canonical == "3.11.4"
-    assert versions[0].distro == "bookworm"
+    assert versions[0].distro == "trixie"
     assert versions[1].nodejs_canonical == "20.3.0"
     assert versions[1].python_canonical == "3.11.4"
     assert versions[1].distro == "alpine"
@@ -248,7 +248,7 @@ def test_decide_nodejs_versions(
         json=node_unofficial_releases,
     )
     supported_node_versions = fetch_supported_nodejs_versions()
-    distros = ["bookworm", "alpine"]
+    distros = ["trixie", "alpine"]
     versions = decide_nodejs_versions(distros, supported_node_versions)
 
     assert len(supported_node_versions) * len(distros) == len(versions)