Revert changes incompatible with legacy EC2

This reverts a number of commits, namely:
- Python 3.12: 41ac2bc.
- Poetry to uv:10a28c27b35c6d8ab1c4644cfebee2d274512c0f.

Relevant dependency changes worth heeding:
- django-crispy-forms: 01252dd
- allauth: e395816

Author: DavidCain

.github/workflows/ci.yml

@@ -8,11 +8,11 @@ jobs:
       fail-fast: false
       matrix:
         command:
-          - "uv run ruff check ."
-          - "uv run ruff format --check ws"
-          - "uv run mypy ws"
-          - "uv run pylint --jobs=0 ws"
-          - "uv run pytest"
+          - "ruff check ."
+          - "ruff format --check ws"
+          - "mypy ws"
+          - "pylint --jobs=0 ws"
+          - "pytest"
     runs-on: ubuntu-22.04
     services:
       # TODO: Only the `test` step in the matrix needs this service up and running.
@@ -36,7 +36,7 @@ jobs:
 
       - name: "Install buildx"
         id: buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
 
       - name: "Restore Docker cache"
         uses: actions/cache@v4

.gitignore

@@ -1,3 +1,5 @@
+/.poetry_prod_up_to_date
+/.poetry_dev_up_to_date
 /.node_packages_up_to_date
 /.coverage
 /.mypy_cache

.python-version

@@ -1,2 +1,3 @@
+python 3.10.17
+poetry 1.8.3
 nodejs 16.20.2
-uv 0.9.5

.tool-versions

@@ -1,37 +1,51 @@
 # TODO:
-# - Consider python:3.12-slim
+# - Consider python:3.10-slim
 # - Once dropping legacy AngularJS, build FE bundles separately
 
 # Things needed to use this in production:
 # - Direct logs to files outside the container
 # - Ensure that Celery works as well
 # - Run WSGI with an ENTRYPOINT
 
-FROM ubuntu:24.04 AS build
+FROM ubuntu:22.04 AS build
 
 WORKDIR /app/
 
 ENV DEBIAN_FRONTEND="noninteractive"
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
-    build-essential \
-    gcc \
+    build-essential gcc \
+    # Only for installing node \
+    curl \
+    # Only needed to install legacy node dependencies from git \
+    git \
     locales \
     # Postgres client (for accessing RDS in production) \
     postgresql-client postgresql-contrib libpq-dev \
+    python3.10 python3-dev python3-pip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
 RUN locale-gen en_US.UTF-8
 RUN update-locale en_US.UTF-8
 
+# `click` will error out without locales explicitly set
 ENV LANGUAGE=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 ENV LC_ALL=en_US.UTF-8
 
-COPY --from=ghcr.io/astral-sh/uv:latest /uv /bin/
+RUN pip3 install --upgrade pip==24.1
+
+COPY .tool-versions .
+RUN pip install poetry==$(awk '/poetry/{printf $2}' .tool-versions)
+COPY poetry.lock .
+
+# Instruct poetry to create a venv in `.venv`, then auto-add it to path
+RUN poetry config virtualenvs.in-project true
+ENV PATH="/app/.venv/bin:$PATH"
+
 COPY pyproject.toml .
-RUN uv sync --all-groups
+RUN poetry install --no-root --with=test,lint,mypy
 
 # TODO: We should install & build the legacy frontend here.
 # But I'm likely going to just rebuild everything. See the Git log for more.
@@ -42,14 +56,14 @@ COPY ws ./ws
 # NOTE: For the legacy AngularJS build, setting `WS_DJANGO_TEST` bypasses compressors
 # (yuglify, specifically). Not a problem for tests, but does break production.
 # Hopefully we've dropped the legacy setup & can just use webpack.
-RUN WS_DJANGO_TEST=1 uv run manage.py collectstatic
+RUN WS_DJANGO_TEST=1 ./manage.py collectstatic
 
 # ------------------------------------------------------------------------
 
 FROM build AS installer
 
 # Remove dev dependencies (smaller venv, no dev deps in prod)
-RUN uv sync --no-dev
+RUN poetry install --no-root --sync --only=prod
 
 FROM ubuntu:22.04
 

Dockerfile

@@ -1,7 +1,10 @@
 .DEFAULT_GOAL := all
 
+poetry_dev_bootstrap_file = .poetry_dev_up_to_date
+poetry_prod_bootstrap_file = .poetry_prod_up_to_date
 npm_bootstrap_file = .node_packages_up_to_date
 
+
 # Default `make` will give everything's that helpful for local development.
 .PHONY: all
 all: install-python-dev install-js
@@ -11,13 +14,23 @@ all: install-python-dev install-js
 build: install-python-prod build-frontend
 
 .PHONY: install-python-dev
-install-python-dev:
-	uv sync --all-groups
-
-# Note this will actually *remove* any dev dependencies, if present.
+install-python-dev: $(poetry_dev_bootstrap_file)
+$(poetry_dev_bootstrap_file): poetry.lock
+	touch $(poetry_dev_bootstrap_file).notyet
+	poetry install --no-root --with=test,lint,mypy
+	mv $(poetry_dev_bootstrap_file).notyet $(poetry_dev_bootstrap_file)
+	@# Remove the prod bootstrap file, since we now have dev deps present.
+	rm -f $(poetry_prod_bootstrap_file)
+
+# Note this will actually *remove* any dev dependencies, if present
 .PHONY: install-python-prod
-install-python-prod:
-	uv sync --no-dev
+install-python-prod: $(poetry_prod_bootstrap_file)
+$(poetry_prod_bootstrap_file): poetry.lock
+	touch $(poetry_prod_bootstrap_file).notyet
+	poetry install --no-root --sync --only=prod
+	mv $(poetry_prod_bootstrap_file).notyet $(poetry_prod_bootstrap_file)
+	@# Remove the dev bootstrap file, since the `--no-dev` removed any present dev deps
+	rm -f $(poetry_dev_bootstrap_file)
 
 .PHONY: install-js
 install-js: $(npm_bootstrap_file)
@@ -35,18 +48,29 @@ build-frontend: install-js
 .PHONY: check
 check: lint test
 
+# Run automatic code formatters/linters that don't require human input
+# (might fix a broken `make check`)
+.PHONY: fix
+fix: install-python-dev
+	poetry run ruff format .
+	poetry run ruff check --fix .
+
 .PHONY: lint
 lint: lint-python typecheck-python lint-js
 
 .PHONY: lint-python
 lint-python: install-python-dev
-	uv run ruff format --check .
-	uv run ruff check .
-	uv run pylint --jobs 0 ws  # '0' tells pylint to auto-detect available processors
+	poetry run ruff format --check .
+	poetry run ruff check .
+	poetry run pylint --jobs 0 ws  # '0' tells pylint to auto-detect available processors
 
 .PHONY: typecheck-python
-typecheck-python:
-	uv run mypy --config-file pyproject.toml ws
+typecheck-python: install-python-dev
+	@# Annoying workaround for `Cannot find component WithAnnotations`
+	if ! poetry run mypy --config-file pyproject.toml ws; then \
+		rm -r .mypy_cache;  \
+		exit 1; \
+	fi
 
 .PHONY: lint-js
 lint-js: install-js
@@ -57,7 +81,7 @@ test: test-python test-js
 
 .PHONY: test-python
 test-python: install-python-dev
-	WS_DJANGO_TEST=1 uv run coverage run -m pytest
+	WS_DJANGO_TEST=1 poetry run coverage run -m pytest
 
 .PHONY: test-js
 test-js: install-js
@@ -66,14 +90,16 @@ test-js: install-js
 # Production webservers won't run this way, so install dev dependencies
 .PHONY: run
 run: install-python-dev
-	uv run python -Wd manage.py runserver
+	poetry run python -Wd manage.py runserver
 
 .PHONY: run-js
 run-js: install-js
 	NODE_ENV=development npm --prefix=frontend/ run serve
 
 .PHONY: clean
 clean:
+	rm -f $(poetry_dev_bootstrap_file)
+	rm -f $(poetry_prod_bootstrap_file)
 	rm -f $(npm_bootstrap_file)
 	rm -rf .mypy_cache
 	find . -name '*.pyc' -delete