Merge pull request #1 from alflanagan/switch_to_uv

Switch to uv

Author: alflanagan

.gitignore

@@ -6,6 +6,3 @@ secrets.txt
 # directories w/files from old website
 /components/
 /public/
-
-# auto-select for my local virtualenv
-.python-version

.python-version

@@ -0,0 +1 @@
+3.13

Dockerfile

@@ -28,9 +28,13 @@ ENV PYTHONUNBUFFERED=1 \
 # Use /app folder as a directory where the source code is stored.
 WORKDIR /app
 
+# requirements handled automatically by uv
 # Install the project requirements.
-COPY app/Makefile requirements.txt /app/
-RUN make pip-setup && pip-sync requirements.txt
+# COPY app/Makefile requirements.txt /app/
+# RUN make pip-setup && pip-sync requirements.txt
 
 # Copy the source code of the project into the container.
 COPY app /app/
+
+RUN pip install --no-cache-dir uv==0.7.12 && \
+    uv sync --frozen

Makefile

@@ -10,32 +10,17 @@ start:
 
 #start a shell running in the django environment
 shell:
-	docker exec -it alf-wag /bin/bash -i
+	docker compose exec -it wagtail /bin/bash -i
 
 rootshell:
-	docker exec -it -u 0 alf-wag /bin/bash -i
+	docker compose exec -it -u 0 wagtail /bin/bash -i
 
 dbshell:
-	 docker exec -it alf-pg /bin/bash -i
-
-requirements:
-	$(PIP_COMPILE) requirements.in; $(PIP_COMPILE) requirements.dev.in
-
-# this does not work, as of 7/7/2004
-# upgrade_reqts:
-#   $(PIP_COMPILE) --upgrade requirements.in --upgrade requirements.dev.in --output-file requirements.txt
-
-upgrade_reqts:
-	$(PIP_COMPILE) --upgrade requirements.in; \
-	$(PIP_COMPILE) --upgrade requirements.dev.in
-
-pip-init:
-	python -m pip install --upgrade pip wheel pip-tools
-
-pip-sync:
-	pip-sync requirements.txt requirements.dev.txt
+	docker compose exec -it postgres /bin/bash -i
 
 # this makes up for the fact that make has no command to show what tasks are defined
 # no attempt was made at a universal solution; you'll need to enhance for any but most basic case
 targets:
 	@grep -E '^[a-zA-Z_-]+:' Makefile | cut -d: -f1 | grep -v targets
+
+tasks: targets

app/Makefile

@@ -1,19 +1,8 @@
-.PHONY: requirements pip-setup tasks stop start rootshell dbshell
-
-PIP_COMPILE = pip-compile --generate-hashes --allow-unsafe --output-file
-
-# run this once, when setting up a totally new environment
-pip-setup:
-	python -m pip install --upgrade pip setuptools wheel pip-tools
-
-# run this any time requirements.in or requirements.dev.in change
-requirements:
-	$(PIP_COMPILE) requirements.txt requirements.in requirements.dev.in
-	pip-sync requirements.txt
+PYTHON=uv run python
 
 run-server:
-	python manage.py migrate
-	python manage.py runserver 0.0.0.0:8080
+	$(PYTHON) manage.py migrate
+	$(PYTHON) manage.py runserver 0.0.0.0:8080
 
 djhtml:
 	find alloydflanagan -name '*.html' -exec djhtml -i -t2 '{}' +
@@ -25,9 +14,9 @@ flake8:
 	find alloydflanagan -name migrations -prune -o -name '*.py' -exec flake8 '{}' +
 
 isort:
-	isort alloydflanagan
+	uv run isort alloydflanagan
 
 black:
-	black alloydflanagan
+	uv run black alloydflanagan
 
 lint: isort black flake8 djhtml

app/pyproject.toml

@@ -1,3 +1,43 @@
+[project]
+name = "alloydflanagan-wag"
+version = "0.1.0"
+description = "Personal web site for A. Lloyd Flanagan"
+readme = "README.md"
+requires-python = ">=3.13"
+dependencies = [
+    "dj-database-url>=2.3.0",
+    "django-htmx>=1.23.0",
+    "django-redis>=5.4.0",
+    "django-structlog>=9.1.1",
+    "django-waffle>=4.2.0",
+    "django-widget-tweaks>=1.5.0",
+    "gunicorn>=23.0.0",
+    "psycopg>=3.2.7",
+    "structlog>=25.3.0",
+    "wagtail==5.1.2",
+]
+
+[dependency-groups]
+dev = [
+    "coverage>=7.8.0",
+    "django-coverage-plugin>=3.1.0",
+    "django-debug-toolbar>=5.2.0",
+    "django-stubs>=5.2.0",
+    "djhtml>=3.0.7",
+    "factory-boy>=3.3.3",
+    "flake8-django>=1.4",
+    "freezegun>=1.5.1",
+    "ipython>=9.2.0",
+    "isort>=6.0.1",
+    "mypy>=1.15.0",
+    "ruff>=0.11.8",
+    "ruff-lsp>=0.0.62",
+    "types-freezegun>=1.1.10",
+    "types-python-dateutil>=2.9.0.20241206",
+    "types-requests>=2.32.0.20250328",
+    "vcrpy>=5.1.0",
+]
+
 [tool.isort]
 line_length = 120
 known_django = "django"

app/uv.lock

@@ -1,6 +1,6 @@
 # this docker file does nothing but make it easy to test your .dockerignore
 # use same image as Dockerfile so we don't have to download any additional ones
-FROM python:3.11.5-slim-bookworm
+FROM python:3.12.5-slim-bookworm
 
 RUN mkdir context
-COPY . context/
+COPY app context/

context.Dockerfile

@@ -2,10 +2,8 @@
 
 services:
   wagtail:
-    image: alflanagan-wagtail-dev
     build:
       context: .
-    container_name: alf-wag
     command: make run-server
     volumes:
       - ./app:/app:delegated
@@ -16,7 +14,6 @@ services:
 
   postgres:
     image: postgres:alpine
-    container_name: alf-pg
     environment:
       POSTGRES_USER: wagtail
       POSTGRES_PASSWORD: development
@@ -28,7 +25,6 @@ services:
 
   redis:
     image: 'redis:7'
-    container_name: "alf-redis"
     restart: on-failure
     volumes:
       - redis:/data