Merge branch 'main' into feature/issue-2611-deprecate-provided-assets-view

Author: iampujan

apps/downloads/templatetags/download_tags.py

@@ -197,6 +197,10 @@ def render_active_releases():
             if status == "feature":
                 status = "pre-release"
 
+            # Skip releases not yet in development
+            if status in ("planned", "prerelease"):
+                continue
+
             if status == "end-of-life":
                 # Include only the most recent EOL release
                 if found_eol:

apps/downloads/tests/test_template_tags.py

@@ -15,6 +15,8 @@
     "3.10": {"status": "security", "end_of_life": "2026-10-04", "pep": 619},
     "3.14": {"status": "bugfix", "first_release": "2025-10-07", "end_of_life": "2030-10", "pep": 745},
     "3.15": {"status": "feature", "first_release": "2026-10-01", "end_of_life": "2031-10", "pep": 790},
+    "3.16": {"status": "prerelease", "first_release": "2027-10-06", "end_of_life": "2032-10", "pep": 826},
+    "3.17": {"status": "planned", "first_release": "2028-10-05", "end_of_life": "2033-10"},
 }
 
 
@@ -234,6 +236,17 @@ def test_eol_status_includes_last_release_link(self, mock_get_data):
         self.assertIn("last release was", status)
         self.assertIn("<a href=", status)
 
+    @mock.patch("apps.downloads.templatetags.download_tags.get_release_cycle_data")
+    def test_planned_and_prerelease_releases_excluded(self, mock_get_data):
+        """Test that planned and prerelease releases are not shown."""
+        mock_get_data.return_value = MOCK_RELEASE_CYCLE
+
+        result = render_active_releases()
+
+        versions = [r["version"] for r in result["releases"]]
+        self.assertNotIn("3.16", versions)
+        self.assertNotIn("3.17", versions)
+
     @mock.patch("apps.downloads.templatetags.download_tags.get_release_cycle_data")
     def test_api_failure_returns_empty_releases(self, mock_get_data):
         """Test that API failure returns empty releases list."""

pyproject.toml

@@ -41,7 +41,7 @@ dependencies = [
     "requests>=2.26.0",
     "django-honeypot==1.3.0",
     "django-markupfield==2.0.1",
-    "django-allauth==65.13.0",
+    "django-allauth==65.14.1",
     "django-waffle==2.2.1",
     "djangorestframework==3.15.2",
     "django-filter==25.1",
@@ -73,7 +73,7 @@ dev = [
     "Faker==40.4.0",
     "tblib==1.7.0",
     "responses==0.26.0",
-    "django-debug-toolbar==5.2.0",
+    "django-debug-toolbar==6.2.0",
     "coverage",
     "ddt",
     "model-bakery==1.23.3",