re-organize Makefile

Signed-off-by: tdruez <tdruez@aboutcode.org>

Author: tdruez

Makefile

@@ -47,7 +47,7 @@ superuser:
 	${MANAGE} createsuperuser
 
 ########################################################################################
-# Utilities
+# Linters / docs
 ########################################################################################
 
 DOCS_LOCATION=./docs
@@ -76,36 +76,12 @@ docs:
 	uvx --from sphinx==9.1.0 --with furo==2025.12.19 sphinx-build -b html ${DOCS_LOCATION} ${DOCS_LOCATION}/_build/html/
 
 ########################################################################################
-
-VENV_LOCATION=.venv
-ACTIVATE?=. ${VENV_LOCATION}/bin/activate;
-#MANAGE=${VENV_LOCATION}/bin/python manage.py
-# Do not depend on Python to generate the SECRET_KEY
-GET_SECRET_KEY=`head -c50 /dev/urandom | base64 | head -c50`
-# Customize with `$ make envfile ENV_FILE=/etc/dejacode/.env`
-ENV_FILE=.env
-DOCKER_COMPOSE=docker compose -f docker-compose.yml
-DOCKER_EXEC=${DOCKER_COMPOSE} exec
-DB_NAME=dejacode_db
-DB_USERNAME=dejacode
-DB_PASSWORD=dejacode
-DB_CONTAINER_NAME=db
-DB_INIT_FILE=./data/postgresql/initdb.sql.gz
-POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=en_US.UTF-8 --lc-ctype=en_US.UTF-8
-TIMESTAMP=$(shell date +"%Y-%m-%d_%H%M")
-
-conf: virtualenv
-	@echo "-> Install dependencies"
-	uv sync --frozen
-	@echo "-> Create the var/ directory"
-	@mkdir -p var
-
-dev: virtualenv
-	@echo "-> Configure and install development dependencies"
-	uv sync --frozen --extra dev
+# Utilities
+########################################################################################
 
 outdated:
 	@echo "-> Check for outdated packages (with 7 days cooldown)"
+	uv sync --frozen --quiet
 	uv pip list --outdated \
 		--no-config \
 		--index-url https://pypi.org/simple \
@@ -119,25 +95,61 @@ upgrade:
 		exit 1; \
 	fi
 	@echo "-> Download $(PACKAGE) wheels for Linux x86_64"
-	pip download $(PACKAGE) \
+	uvx pip download $(PACKAGE) \
 		--only-binary=:all: \
 		--platform manylinux_2_28_x86_64 \
 		--platform manylinux_2_17_x86_64 \
 		--python-version 3.14 \
 		--dest ./thirdparty/dist/
 	@echo "-> Download $(PACKAGE) wheels for macOS ARM64"
-	pip download $(PACKAGE) \
+	uvx pip download $(PACKAGE) \
 		--only-binary=:all: \
 		--platform macosx_11_0_arm64 \
 		--python-version 3.14 \
 		--dest ./thirdparty/dist/
 	@echo "-> Update pyproject.toml and uv.lock"
-	uv add $(PACKAGE)
+	uvx uv add $(PACKAGE)
 
 lock:
 	@echo "-> Regenerate uv.lock from local wheels"
 	uv lock
 
+clean:
+	@echo "-> Clean the Python env"
+	rm -rf .venv/ .*_cache/ *.egg-info/ build/ dist/
+	find . -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete
+
+########################################################################################
+# Local venv commands (legacy)
+########################################################################################
+
+VENV_LOCATION=.venv
+ACTIVATE?=. ${VENV_LOCATION}/bin/activate;
+#MANAGE=${VENV_LOCATION}/bin/python manage.py
+# Do not depend on Python to generate the SECRET_KEY
+GET_SECRET_KEY=`head -c50 /dev/urandom | base64 | head -c50`
+# Customize with `$ make envfile ENV_FILE=/etc/dejacode/.env`
+ENV_FILE=.env
+DOCKER_COMPOSE=docker compose -f docker-compose.yml
+DOCKER_EXEC=${DOCKER_COMPOSE} exec
+DB_NAME=dejacode_db
+DB_USERNAME=dejacode
+DB_PASSWORD=dejacode
+DB_CONTAINER_NAME=db
+DB_INIT_FILE=./data/postgresql/initdb.sql.gz
+POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=en_US.UTF-8 --lc-ctype=en_US.UTF-8
+TIMESTAMP=$(shell date +"%Y-%m-%d_%H%M")
+
+conf: virtualenv
+	@echo "-> Install dependencies"
+	uv sync --frozen
+	@echo "-> Create the var/ directory"
+	@mkdir -p var
+
+dev: virtualenv
+	@echo "-> Configure and install development dependencies"
+	uv sync --frozen --extra dev
+
 envfile:
 	@echo "-> Create the .env file and generate a secret key"
 	@if test -f ${ENV_FILE}; then echo "${ENV_FILE} file exists already"; exit 1; fi
@@ -148,15 +160,6 @@ envfile_dev: envfile
 	@echo "-> Update the .env file for development"
 	@echo DATABASE_PASSWORD=\"dejacode\" >> ${ENV_FILE}
 
-check-deploy:
-	@echo "-> Check Django deployment settings"
-	${MANAGE} check --deploy
-
-clean:
-	@echo "-> Clean the Python env"
-	rm -rf .venv/ .*_cache/ *.egg-info/ build/ dist/
-	find . -type f -name '*.py[co]' -delete -o -type d -name __pycache__ -delete
-
 initdb:
 	@echo "-> Stop Docker services that access the database"
 	${DOCKER_COMPOSE} stop web worker
@@ -181,4 +184,4 @@ psql:
 log:
 	${DOCKER_COMPOSE} logs --tail="100" ${SERVICE}
 
-.PHONY: virtualenv conf dev lock upgrade envfile envfile_dev check outdated doc8 valid check-deploy clean initdb postgresdb postgresdb_clean migrate run test docs build psql bash shell log superuser
+.PHONY: virtualenv conf dev lock upgrade envfile envfile_dev check outdated doc8 valid clean initdb postgresdb postgresdb_clean migrate run test docs build psql bash shell log superuser

pyproject.toml

@@ -98,7 +98,7 @@ dependencies = [
     "XlsxWriter==3.2.9",
     # Markdown
     "markdown==3.10.2",
-    "bleach==6.3.0",
+    "bleach==6.4.0",
     "bleach_allowlist==1.0.3",
     "webencodings==0.5.1",
     # Authentication