Upgrade to Python 3.13 with test suite fixes

.github/workflows/tests.yml

@@ -1,6 +1,7 @@
-name: Django Tests
+name: "Django Tests"
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -22,7 +23,8 @@ jobs:
 
       - name: Pull Docker images
         run: |
-          docker pull newsblur/newsblur_python3:latest || true
+          docker pull newsblur/newsblur_python3:py313 || true
+          docker tag newsblur/newsblur_python3:py313 newsblur/newsblur_python3:latest || true
           docker pull newsblur/newsblur_node:latest || true
           # Pre-pull Elasticsearch with retries to avoid TLS timeout issues
           for i in 1 2 3; do
@@ -54,7 +56,7 @@ jobs:
           # Retry docker compose up in case of transient network issues
           # Use CI override to remove ARM-specific JVM flags (UseSVE) that crash on x86_64
           for i in 1 2 3; do
-            docker compose -f docker-compose.yml -f docker-compose.ci.yml up -d && break
+            docker compose -f docker-compose.yml -f docker-compose.ci.yml up -d newsblur_web && break
             echo "Retry $i for docker compose up..."
             docker compose -f docker-compose.yml -f docker-compose.ci.yml down -v || true
             sleep 10
@@ -95,7 +97,7 @@ jobs:
           # Django fails to DROP the test DB because lingering connections (from Sentry SDK
           # name resolution failures) keep it open. The CI container is ephemeral anyway.
           docker compose -f docker-compose.yml -f docker-compose.ci.yml exec -T newsblur_web python3 manage.py test apps --noinput -v 1 --failfast --keepdb
-        timeout-minutes: 5
+        timeout-minutes: 10
 
       - name: Show logs on failure
         if: failure()

Makefile

@@ -328,22 +328,40 @@ lint:
 	docker exec -t newsblur_web flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude=venv,apps/analyzer/archive,utils/archive,vendor,.worktree,.claude
 
 deps:
-	docker exec -t newsblur_web pip install -U uv
-	docker exec -t newsblur_web uv pip install -r requirements.txt
+	@WORKSPACE_NAME=$$(basename "$$(pwd)"); \
+	if [ -d ".git" ]; then \
+		CONTAINER_NAME="newsblur_web"; \
+	else \
+		CONTAINER_NAME="newsblur_web_$$WORKSPACE_NAME"; \
+	fi; \
+	docker exec -t $$CONTAINER_NAME sh -lc "cd /srv/newsblur && UV_PROJECT_ENVIRONMENT=/venv uv sync --locked"; \
+	docker exec -t $$CONTAINER_NAME sh -lc "cd /srv/newsblur && UV_PROJECT_ENVIRONMENT=/venv uv export --locked --no-hashes -o config/requirements.txt"
 
 jekyll_build:
 	cd blog && JEKYLL_ENV=production bundle exec jekyll build
 
-# runs tests
-# Usage: make test [SCOPE=apps.reader] [ARGS="--noinput -v 2"]
+# runs Django tests
+# Usage: make test [SCOPE=apps] [ARGS="-v 1 --failfast"]
 SCOPE ?= apps
-ARGS ?= --noinput -v 1 --failfast
+ARGS ?= -v 1 --failfast
 test:
 	docker compose exec -T newsblur_web python3 manage.py test $(SCOPE) --noinput $(ARGS)
 
+# runs Django tests (legacy alias)
+# Usage: make test-django [SCOPE=apps.reader] [ARGS="-v 2"]
+test-django:
+	docker compose exec -T newsblur_web python3 manage.py test $(SCOPE) --noinput $(ARGS)
+
+# runs tests with pytest
+# Usage: make test-pytest [PYTEST_SCOPE=apps] [PYTEST_ARGS="-v --tb=short"]
+PYTEST_SCOPE ?= apps
+PYTEST_ARGS ?= -v --tb=short
+test-pytest:
+	docker compose exec -T newsblur_web pytest $(PYTEST_SCOPE) $(PYTEST_ARGS)
+
 # runs river stories tests with query profiling
 test-river:
-	docker compose exec -T newsblur_web python3 manage.py test apps.reader.test_river_stories --noinput -v 2
+	docker compose exec -T newsblur_web pytest apps/reader/test_river_stories.py -v
 
 keys:
 	@if [ -f "config/certificates/localhost.pem" ]; then \
@@ -409,7 +427,7 @@ pull:
 
 local_build_web:
 	# docker buildx build --load . --file=docker/newsblur_base_image.Dockerfile --tag=newsblur/newsblur_python3
-	docker build . --file=docker/newsblur_base_image.Dockerfile --tag=newsblur/newsblur_python3
+	docker build $(if $(filter 1 true yes,$(NO_CACHE)),--no-cache,) . --file=docker/newsblur_base_image.Dockerfile --tag=newsblur/newsblur_python3
 
 # Ensure buildx builder exists for multi-platform builds
 # The default 'docker' driver doesn't support multi-platform; we need 'docker-container'
@@ -426,27 +444,33 @@ buildx_setup:
 buildx_clean:
 	docker buildx prune -f
 
+BUILDX_NO_CACHE_FLAG := $(if $(filter 1 true yes,$(NO_CACHE)),--no-cache,)
+
 build_web: buildx_setup
-	docker buildx build . --platform linux/amd64,linux/arm64 --file=docker/newsblur_base_image.Dockerfile --tag=newsblur/newsblur_python3
+	docker buildx build . $(BUILDX_NO_CACHE_FLAG) --platform linux/amd64,linux/arm64 --file=docker/newsblur_base_image.Dockerfile --tag=newsblur/newsblur_python3
 build_node: buildx_setup
-	docker buildx build . --platform linux/amd64,linux/arm64 --file=docker/node/Dockerfile --tag=newsblur/newsblur_node
+	docker buildx build . $(BUILDX_NO_CACHE_FLAG) --platform linux/amd64,linux/arm64 --file=docker/node/Dockerfile --tag=newsblur/newsblur_node
 build_monitor: buildx_setup
-	docker buildx build . --platform linux/amd64,linux/arm64 --file=docker/monitor/Dockerfile --tag=newsblur/newsblur_monitor
+	docker buildx build . $(BUILDX_NO_CACHE_FLAG) --platform linux/amd64,linux/arm64 --file=docker/monitor/Dockerfile --tag=newsblur/newsblur_monitor
 build_deploy: buildx_setup
-	docker buildx build . --platform linux/amd64,linux/arm64 --file=docker/newsblur_deploy.Dockerfile --tag=newsblur/newsblur_deploy
+	docker buildx build . $(BUILDX_NO_CACHE_FLAG) --platform linux/amd64,linux/arm64 --file=docker/newsblur_deploy.Dockerfile --tag=newsblur/newsblur_deploy
 build_mcp: buildx_setup
-	docker buildx build ./newsblur_mcp --platform linux/amd64,linux/arm64 --file=newsblur_mcp/Dockerfile --tag=newsblur/newsblur_mcp
+	docker buildx build ./newsblur_mcp $(BUILDX_NO_CACHE_FLAG) --platform linux/amd64,linux/arm64 --file=newsblur_mcp/Dockerfile --tag=newsblur/newsblur_mcp
 build: build_web build_node build_monitor build_deploy build_mcp
 push_web: buildx_setup
-	docker buildx build . --push --platform linux/amd64,linux/arm64 --file=docker/newsblur_base_image.Dockerfile --tag=newsblur/newsblur_python3
+	docker buildx build . $(BUILDX_NO_CACHE_FLAG) --push --platform linux/amd64,linux/arm64 --file=docker/newsblur_base_image.Dockerfile --tag=newsblur/newsblur_python3
+push_web_py313: buildx_setup
+	docker buildx build . $(BUILDX_NO_CACHE_FLAG) --push --platform linux/amd64,linux/arm64 --file=docker/newsblur_base_image.Dockerfile --tag=newsblur/newsblur_python3:py313
 push_node: buildx_setup
-	docker buildx build . --push --platform linux/amd64,linux/arm64 --file=docker/node/Dockerfile --tag=newsblur/newsblur_node
+	docker buildx build . $(BUILDX_NO_CACHE_FLAG) --push --platform linux/amd64,linux/arm64 --file=docker/node/Dockerfile --tag=newsblur/newsblur_node
 push_monitor: buildx_setup
-	docker buildx build . --push --platform linux/amd64,linux/arm64 --file=docker/monitor/Dockerfile --tag=newsblur/newsblur_monitor
+	docker buildx build . $(BUILDX_NO_CACHE_FLAG) --push --platform linux/amd64,linux/arm64 --file=docker/monitor/Dockerfile --tag=newsblur/newsblur_monitor
 push_deploy: buildx_setup
-	docker buildx build . --push --platform linux/amd64,linux/arm64 --file=docker/newsblur_deploy.Dockerfile --tag=newsblur/newsblur_deploy
+	docker buildx build . $(BUILDX_NO_CACHE_FLAG) --push --platform linux/amd64,linux/arm64 --file=docker/newsblur_deploy.Dockerfile --tag=newsblur/newsblur_deploy
+push_deploy_py313: buildx_setup
+	docker buildx build . $(BUILDX_NO_CACHE_FLAG) --push --platform linux/amd64,linux/arm64 --file=docker/newsblur_deploy.Dockerfile --build-arg BASE_IMAGE=newsblur/newsblur_python3:py313 --tag=newsblur/newsblur_deploy:py313
 push_mcp: buildx_setup
-	docker buildx build ./newsblur_mcp --push --platform linux/amd64,linux/arm64 --file=newsblur_mcp/Dockerfile --tag=newsblur/newsblur_mcp
+	docker buildx build ./newsblur_mcp $(BUILDX_NO_CACHE_FLAG) --push --platform linux/amd64,linux/arm64 --file=newsblur_mcp/Dockerfile --tag=newsblur/newsblur_mcp
 push_cli:
 	gh workflow run publish-cli.yml -f dry_run=false
 push_images: push_web push_node push_monitor push_deploy push_mcp

ansible/group_vars/staging.yml

@@ -1,3 +1,4 @@
 ---
-git_branch: mcp-server
+git_branch: python313
+newsblur_image_tag: py313
 disable_consul_services_ie_staging: yes

ansible/playbooks/deploy_app.yml

@@ -31,15 +31,15 @@
     - name: Updating NewsBlur Deploy container
       run_once: yes
       connection: local
-      command: chdir={{ newsblur_repo_path }} docker pull newsblur/newsblur_deploy
+      command: chdir={{ newsblur_repo_path }} docker pull newsblur/newsblur_deploy:{{ newsblur_image_tag | default('latest') }}
       tags:
         - never
         - static
 
     - name: Compressing JS/CSS assets
       run_once: yes
       connection: local
-      command: chdir={{ newsblur_repo_path }} docker run --rm -v {{ newsblur_repo_path }}:/srv/newsblur newsblur/newsblur_deploy
+      command: chdir={{ newsblur_repo_path }} docker run --rm -v {{ newsblur_repo_path }}:/srv/newsblur newsblur/newsblur_deploy:{{ newsblur_image_tag | default('latest') }}
       tags:
         - never
         - static

ansible/playbooks/deploy_app_group_static.yml

@@ -81,7 +81,7 @@
 - name: Restart newsblur_web container
   docker_container:
     name: newsblur_web
-    image: newsblur/newsblur_python3
+    image: "newsblur/newsblur_python3:{{ newsblur_image_tag | default('latest') }}"
     container_default_behavior: no_defaults
     pull: yes
     env:

ansible/roles/celery_task/tasks/container.yml

@@ -3,7 +3,7 @@
   become: yes
   docker_container:
     name: "{{ item.container_name }}"
-    image: newsblur/newsblur_python3
+    image: "newsblur/newsblur_python3:{{ newsblur_image_tag | default('latest') }}"
     state: started
     pull: yes
     restart: "{{ container_restart | default(false) }}"

ansible/roles/repo/tasks/main.yml

@@ -12,4 +12,4 @@
   git:
     repo: https://github.com/samuelclay/NewsBlur.git
     dest: /srv/newsblur/
-    version: main
+    version: "{{ git_branch }}"

ansible/roles/web/tasks/container.yml

@@ -4,7 +4,7 @@
   throttle: 3
   docker_container:
     name: newsblur_web
-    image: newsblur/newsblur_python3
+    image: "newsblur/newsblur_python3:{{ newsblur_image_tag | default('latest') }}"
     container_default_behavior: no_defaults
     pull: yes
     env:

ansible/roles/web/tasks/main.yml

@@ -66,7 +66,7 @@
 - name: Update to latest NewsBlur Web Docker image
   become: yes
   docker_image:
-    name: newsblur/newsblur_python3
+    name: "newsblur/newsblur_python3:{{ newsblur_image_tag | default('latest') }}"
     source: pull
 
 - include_tasks: container.yml