[chore] Update uv, update Django version, some TLC for the GH Actions

Author: olivierphi

.github/workflows/test-suite.yml

@@ -19,6 +19,7 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
+      # Setup
       - uses: "actions/checkout@v4"
       - name: Install uv
         uses: astral-sh/setup-uv@v2
@@ -32,16 +33,22 @@ jobs:
         run: uv sync --all-extras
       - name: "Install the project in 'editable' mode"
         run: uv pip install -e .
+        
+      # Code quality checks
       - name: "Run linting checks: Ruff checker"
         run: uv run --no-sync ruff format --check --quiet src/
       - name: "Run linting checks: Ruff linter"
         run: uv run --no-sync ruff check --quiet src/
       - name: "Run linting checks: Mypy"
         run: uv run --no-sync mypy src/
+      - name: "Run linting checks: fix-future-annotations"
+        run: uv run --no-sync fix-future-annotations src/
       - name: "Check that Django DB migrations are up to date"
-        run: uv run --no-sync python manage.py makemigrations | grep "No changes detected"
+        run: uv run --no-sync python manage.py makemigrations --check
+        
+      # Test suite & code coverage
       - name: "Run tests"
-        # TODO: progressively  increase minimum coverage to something closer to 80%
+        # TODO: progressively increase minimum coverage to something closer to 80%
         run: uv run --no-sync pytest --cov=src --cov-report xml:coverage.xml
         # --cov-fail-under=60 --> we'll actually do that with the "Report coverage" step
       - name: "Report coverage"

Makefile

@@ -2,9 +2,7 @@ PYTHON_BINS ?= ./.venv/bin
 PYTHON ?= ${PYTHON_BINS}/python
 DJANGO_SETTINGS_MODULE ?= project.settings.development
 SUB_MAKE = ${MAKE} --no-print-directory
-UV_PYTHON ?= ${PYTHON}
 UV ?= bin/uv
-UVX ?= bin/uvx
 
 .DEFAULT_GOAL := help
 
@@ -116,8 +114,7 @@ code-quality/mypy: ## Python's equivalent of TypeScript
 code-quality/fix-future-annotations: fix_future_annotations_opts ?=
 code-quality/fix-future-annotations: ## Make sure we're using PEP 585 and PEP 604
 # @link https://github.com/frostming/fix-future-annotations
-	@UV_PYTHON=${UV_PYTHON} \
-		${UVX} fix-future-annotations ${fix_future_annotations_opts} src/ 
+	@${PYTHON_BINS}/fix-future-annotations ${fix_future_annotations_opts} src/ 
 
 # Here starts the frontend stuff
 
@@ -185,10 +182,10 @@ frontend/img/copy_assets:
 
 # Here starts the "misc util targets" stuff
 
-bin/uv: uv_version ?= 0.4.9
+bin/uv: uv_version ?= 0.5.7
 bin/uv: # Install `uv` and `uvx` locally in the "bin/" folder
 	curl -LsSf "https://astral.sh/uv/${uv_version}/install.sh" | \
-		CARGO_DIST_FORCE_INSTALL_DIR="$$(pwd)" INSTALLER_NO_MODIFY_PATH=1 sh
+		UV_INSTALL_DIR="$$(pwd)/bin" UV_NO_MODIFY_PATH=1 sh
 	@echo "We'll use 'bin/uv' to manage Python dependencies." 
 
 .venv: ## Initialises the Python virtual environment in a ".venv" folder, via uv

pyproject.toml

@@ -12,7 +12,7 @@ requires-python = ">=3.11"
 
 dependencies= [
     # Django doesn't follow SemVer, so we need to specify the minor version:
-    "Django==5.1.*",
+    "django==5.1.*",
     "gunicorn==22.*",
     "uvicorn[standard]==0.30.*",
     "uvicorn-worker==0.2.*",
@@ -43,11 +43,7 @@ dev = [
     "types-requests==2.*",
     "django-extensions==3.*",
     "sqlite-utils==3.*",
-    # N.B. As it turns out that Lichess' "Berserk" package misses some features we need,
-    # such as the creation of correspondence Seeks... 
-    # And as we had to wrap evey call in an `sync_to_async` anyway, which was not great... 
-    # We only use  for its `types` module at the momemt.
-    "berserk==0.13.*",
+    "fix-future-annotations>=0.5.0",
 ]
 test = [
     "pytest==8.3.*",