From 1fbc81acf8a8d8fca2ea6aa29265fc2b8be4ac52 Mon Sep 17 00:00:00 2001 From: chriscummings Date: Tue, 26 Aug 2025 10:16:27 -0500 Subject: [PATCH 1/6] fix: move to bookworm --- compose/local/translator/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/local/translator/Dockerfile b/compose/local/translator/Dockerfile index 48f37924..cbc74cc8 100644 --- a/compose/local/translator/Dockerfile +++ b/compose/local/translator/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8-slim-buster +FROM python:3.8-slim-bookworm ENV PYTHONUNBUFFERED 1 ENV PYTHONDONTWRITEBYTECODE 1 From 9c0fbc65c9e04414ec8ea36f4a25dbae0d887e13 Mon Sep 17 00:00:00 2001 From: chriscummings Date: Tue, 26 Aug 2025 11:32:16 -0500 Subject: [PATCH 2/6] chore: bump behave-django and hope it fixes things, they refactored behave internally. --- requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/local.txt b/requirements/local.txt index 134a2213..9f0f99cf 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -9,7 +9,7 @@ watchgod==0.8.2 # https://github.com/samuelcolvin/watchgod # ------------------------------------------------------------------------------ django-stubs==1.11.0 # https://github.com/typeddjango/django-stubs pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar -behave-django==1.4.0 # https://github.com/behave/behave-django +behave-django==1.7.0 # https://github.com/behave/behave-django # Documentation # ------------------------------------------------------------------------------ From 66116db8e64a7585aee1bf7d71bb88dbb0704673 Mon Sep 17 00:00:00 2001 From: chriscummings Date: Tue, 26 Aug 2025 11:35:18 -0500 Subject: [PATCH 3/6] chore: allow uv to use pre-releases if we have to (behave-django depends on pre-releases of behave :/) --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index c7370eb1..7febba4f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -137,3 +137,6 @@ ignore_errors = true [tool.django-stubs] django_settings_module = "config.settings.test" + +[tool.uv] +prerelease = "if-necessary-or-explicit" From fd794c1857b51db5deae89fbf9d32e446e3f3e00 Mon Sep 17 00:00:00 2001 From: chriscummings Date: Tue, 26 Aug 2025 11:40:12 -0500 Subject: [PATCH 4/6] chore: allow pre-release, this time inline. --- .github/workflows/pytest.yml | 2 +- .github/workflows/pytest_next_python.yml | 2 +- compose/local/django/Dockerfile | 2 +- compose/local/docs/Dockerfile | 2 +- pyproject.toml | 3 --- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index a78abb64..0f3cde9c 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -61,7 +61,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - uv pip install --system -r requirements/local.txt + uv pip install --system -r requirements/local.txt --prerelease=allow # https://github.com/pytest-dev/pytest-github-actions-annotate-failures/pull/68 isn't yet in a release uv pip install --system git+https://github.com/pytest-dev/pytest-github-actions-annotate-failures.git@6e66cd895fe05cd09be8bad58f5d79110a20385f diff --git a/.github/workflows/pytest_next_python.yml b/.github/workflows/pytest_next_python.yml index 25a5f54b..e85d3e6c 100644 --- a/.github/workflows/pytest_next_python.yml +++ b/.github/workflows/pytest_next_python.yml @@ -55,7 +55,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install uv - uv pip install --system -r requirements/local.txt + uv pip install --system -r requirements/local.txt --prerelease=allow # https://github.com/pytest-dev/pytest-github-actions-annotate-failures/pull/68 isn't yet in a release uv pip install --system git+https://github.com/pytest-dev/pytest-github-actions-annotate-failures.git@6e66cd895fe05cd09be8bad58f5d79110a20385f diff --git a/compose/local/django/Dockerfile b/compose/local/django/Dockerfile index 182e5ca0..b2ba11c5 100644 --- a/compose/local/django/Dockerfile +++ b/compose/local/django/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get update \ # Requirements are installed here to ensure they will be cached. COPY ./requirements /requirements RUN pip install uv -RUN uv pip install --system -r /requirements/local.txt +RUN uv pip install --system -r /requirements/local.txt --prerelease=allow COPY ./compose/production/django/entrypoint /entrypoint RUN sed -i 's/\r$//g' /entrypoint diff --git a/compose/local/docs/Dockerfile b/compose/local/docs/Dockerfile index 78dcfbc3..a7ac21e6 100644 --- a/compose/local/docs/Dockerfile +++ b/compose/local/docs/Dockerfile @@ -26,7 +26,7 @@ RUN apt-get update \ # Only re-run the pip install if these files have changed COPY requirements/base.txt requirements/local.txt requirements/production.txt /app/requirements/ RUN pip install uv -RUN uv pip install --system -r /app/requirements/local.txt -r /app/requirements/production.txt +RUN uv pip install --system -r /app/requirements/local.txt -r /app/requirements/production.txt --prerelease=allow COPY . /app/ diff --git a/pyproject.toml b/pyproject.toml index 7febba4f..c7370eb1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -137,6 +137,3 @@ ignore_errors = true [tool.django-stubs] django_settings_module = "config.settings.test" - -[tool.uv] -prerelease = "if-necessary-or-explicit" From 559d0260a49aeba55a865e00b840f17a342dd973 Mon Sep 17 00:00:00 2001 From: chriscummings Date: Tue, 26 Aug 2025 11:59:29 -0500 Subject: [PATCH 5/6] chore: Might as well go to trixie if it works. --- compose/local/django/Dockerfile | 2 +- compose/local/docs/Dockerfile | 2 +- compose/local/translator/Dockerfile | 2 +- compose/production/django/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compose/local/django/Dockerfile b/compose/local/django/Dockerfile index b2ba11c5..19cd91f3 100644 --- a/compose/local/django/Dockerfile +++ b/compose/local/django/Dockerfile @@ -1,6 +1,6 @@ ARG PYTHON_IMAGE_VER=3.12 -FROM python:${PYTHON_IMAGE_VER}-slim-bookworm +FROM python:${PYTHON_IMAGE_VER}-slim-trixie ENV PIP_ROOT_USER_ACTION ignore ENV PYTHONUNBUFFERED 1 diff --git a/compose/local/docs/Dockerfile b/compose/local/docs/Dockerfile index a7ac21e6..541380e0 100644 --- a/compose/local/docs/Dockerfile +++ b/compose/local/docs/Dockerfile @@ -1,6 +1,6 @@ ARG PYTHON_IMAGE_VER=3.12 -FROM python:${PYTHON_IMAGE_VER}-slim-bookworm +FROM python:${PYTHON_IMAGE_VER}-slim-trixie ENV PIP_ROOT_USER_ACTION ignore ENV PYTHONUNBUFFERED 1 diff --git a/compose/local/translator/Dockerfile b/compose/local/translator/Dockerfile index cbc74cc8..23cf5f03 100644 --- a/compose/local/translator/Dockerfile +++ b/compose/local/translator/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8-slim-bookworm +FROM python:3.9-slim-trixie ENV PYTHONUNBUFFERED 1 ENV PYTHONDONTWRITEBYTECODE 1 diff --git a/compose/production/django/Dockerfile b/compose/production/django/Dockerfile index a83f74d1..acd381ee 100644 --- a/compose/production/django/Dockerfile +++ b/compose/production/django/Dockerfile @@ -1,7 +1,7 @@ ARG PYTHON_IMAGE_VER=3.12 -FROM python:${PYTHON_IMAGE_VER}-slim-bookworm +FROM python:${PYTHON_IMAGE_VER}-slim-trixie ENV PYTHONUNBUFFERED 1 From 5e3fbdaa7c3d06e4916114e1aa7c67f415aaf92c Mon Sep 17 00:00:00 2001 From: chriscummings Date: Tue, 26 Aug 2025 12:04:44 -0500 Subject: [PATCH 6/6] chore: revert to bookworm, trixie breaks stuff that we can look at later. --- compose/local/django/Dockerfile | 2 +- compose/local/docs/Dockerfile | 2 +- compose/local/translator/Dockerfile | 2 +- compose/production/django/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compose/local/django/Dockerfile b/compose/local/django/Dockerfile index 19cd91f3..b2ba11c5 100644 --- a/compose/local/django/Dockerfile +++ b/compose/local/django/Dockerfile @@ -1,6 +1,6 @@ ARG PYTHON_IMAGE_VER=3.12 -FROM python:${PYTHON_IMAGE_VER}-slim-trixie +FROM python:${PYTHON_IMAGE_VER}-slim-bookworm ENV PIP_ROOT_USER_ACTION ignore ENV PYTHONUNBUFFERED 1 diff --git a/compose/local/docs/Dockerfile b/compose/local/docs/Dockerfile index 541380e0..a7ac21e6 100644 --- a/compose/local/docs/Dockerfile +++ b/compose/local/docs/Dockerfile @@ -1,6 +1,6 @@ ARG PYTHON_IMAGE_VER=3.12 -FROM python:${PYTHON_IMAGE_VER}-slim-trixie +FROM python:${PYTHON_IMAGE_VER}-slim-bookworm ENV PIP_ROOT_USER_ACTION ignore ENV PYTHONUNBUFFERED 1 diff --git a/compose/local/translator/Dockerfile b/compose/local/translator/Dockerfile index 23cf5f03..91c70ba6 100644 --- a/compose/local/translator/Dockerfile +++ b/compose/local/translator/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-slim-trixie +FROM python:3.9-slim-bookworm ENV PYTHONUNBUFFERED 1 ENV PYTHONDONTWRITEBYTECODE 1 diff --git a/compose/production/django/Dockerfile b/compose/production/django/Dockerfile index acd381ee..a83f74d1 100644 --- a/compose/production/django/Dockerfile +++ b/compose/production/django/Dockerfile @@ -1,7 +1,7 @@ ARG PYTHON_IMAGE_VER=3.12 -FROM python:${PYTHON_IMAGE_VER}-slim-trixie +FROM python:${PYTHON_IMAGE_VER}-slim-bookworm ENV PYTHONUNBUFFERED 1