Merge branch 'main' into edit-this-release-vary

Author: JacobCoffee

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
         with:
             python-version-file: '.python-version'
       - name: Cache Python dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         env:
           cache-name: pythondotorg-cache-pip
         with:

.github/workflows/static.yml

@@ -12,7 +12,7 @@ jobs:
         with:
             python-version-file: '.python-version'
       - name: Cache Python dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         env:
           cache-name: pythondotorg-cache-pip
         with:

downloads/api.py

@@ -68,7 +68,7 @@ class Meta(GenericResource.Meta):
             'name', 'slug',
             'creator', 'last_modified_by',
             'os', 'release', 'description', 'is_source', 'url', 'gpg_signature_file',
-            'md5_sum', 'filesize', 'download_button', 'sigstore_signature_file',
+            'md5_sum', 'sha256_sum', 'filesize', 'download_button', 'sigstore_signature_file',
             'sigstore_cert_file', 'sigstore_bundle_file', 'sbom_spdx2_file',
         ]
         filtering = {

downloads/migrations/0014_releasefile_sha256_sum.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.26 on 2025-11-27 16:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('downloads', '0013_alter_release_content_markup_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='releasefile',
+            name='sha256_sum',
+            field=models.CharField(blank=True, max_length=200, verbose_name='SHA256 Sum'),
+        ),
+    ]

downloads/models.py

@@ -175,16 +175,13 @@ def update_supernav():
         if latest_pymanager:
             data['pymanager'] = latest_pymanager.download_file_for_os(o.slug)
 
-        python_files.append(data)
+        # Only include OSes that have at least one download file
+        if data['python3'] or data['pymanager']:
+            python_files.append(data)
 
     if not python_files:
         return
 
-    if not all(f['python3'] or f['pymanager'] for f in python_files):
-        # We have a latest Python release, different OSes, but don't have release
-        # files for the release, so return early.
-        return
-
     content = render_to_string('downloads/supernav.html', {
         'python_files': python_files,
         'last_updated': timezone.now(),
@@ -360,6 +357,7 @@ class ReleaseFile(ContentManageable, NameSlugModel):
         "SPDX-2 SBOM URL", blank=True, help_text="SPDX-2 SBOM URL"
     )
     md5_sum = models.CharField('MD5 Sum', max_length=200, blank=True)
+    sha256_sum = models.CharField('SHA256 Sum', max_length=200, blank=True)
     filesize = models.IntegerField(default=0)
     download_button = models.BooleanField(default=False, help_text="Use for the supernav download button for this OS")
 

downloads/serializers.py

@@ -43,6 +43,7 @@ class Meta:
             'url',
             'gpg_signature_file',
             'md5_sum',
+            'sha256_sum',
             'filesize',
             'download_button',
             'resource_uri',

downloads/templatetags/download_tags.py

@@ -1,6 +1,76 @@
+import logging
+import re
+
+import requests
 from django import template
+from django.core.cache import cache
 
 register = template.Library()
+logger = logging.getLogger(__name__)
+
+PYTHON_RELEASES_URL = "https://peps.python.org/api/python-releases.json"
+PYTHON_RELEASES_CACHE_KEY = "python_python_releases"
+PYTHON_RELEASES_CACHE_TIMEOUT = 3600  # 1 hour
+
+
+def get_python_releases_data() -> dict | None:
+    """Fetch and cache the Python release cycle data from PEPs API."""
+    data = cache.get(PYTHON_RELEASES_CACHE_KEY)
+    if data is not None:
+        return data
+
+    try:
+        response = requests.get(PYTHON_RELEASES_URL, timeout=5)
+        response.raise_for_status()
+        data = response.json()
+        cache.set(PYTHON_RELEASES_CACHE_KEY, data, PYTHON_RELEASES_CACHE_TIMEOUT)
+        return data
+    except (requests.RequestException, ValueError) as e:
+        logger.warning("Failed to fetch release cycle data: %s", e)
+        return None
+
+
+@register.simple_tag
+def get_eol_info(release) -> dict:
+    """
+    Check if a release's minor version is end-of-life.
+
+    Returns a dict with 'is_eol' boolean and 'eol_date' if available.
+    Python 2 releases not found in the release cycle data, assumes EOL.
+    """
+    result = {"is_eol": False, "eol_date": None}
+
+    version = release.get_version()
+    if not version:
+        return result
+
+    # Extract minor version (e.g. "3.9" from "3.9.14")
+    match = re.match(r"^(\d+)\.(\d+)", version)
+    if not match:
+        return result
+
+    major = int(match.group(1))
+    minor_version = f"{match.group(1)}.{match.group(2)}"
+
+    python_releases = get_python_releases_data()
+    if python_releases is None:
+        # Can't determine EOL status, don't show warning
+        return result
+
+    metadata = python_releases.get("metadata", {})
+    version_info = metadata.get(minor_version)
+
+    if version_info is None:
+        # Python 2 releases not in the list are EOL
+        if major <= 2:
+            result["is_eol"] = True
+        return result
+
+    if version_info.get("status") == "end-of-life":
+        result["is_eol"] = True
+        result["eol_date"] = version_info.get("end_of_life")
+
+    return result
 
 
 @register.filter

downloads/tests/test_models.py

@@ -157,7 +157,7 @@ def test_update_supernav(self):
                 release=self.python_3,
                 slug=slug,
                 name='Python 3.10',
-                url='/ftp/python/{}.zip'.format(slug),
+                url=f'/ftp/python/{slug}.zip',
                 download_button=True,
             )
 
@@ -186,3 +186,47 @@ def test_update_supernav(self):
         self.assertIn('class="download-os-windows"', content)
         self.assertIn('pymanager-25.0.msix', content)
         self.assertIn('python3.10-windows.zip', content)
+
+    def test_update_supernav_skips_os_without_files(self):
+        """Test that update_supernav works when an OS has no download files.
+
+        Regression test for a bug where adding an OS (like Android) without
+        any release files would cause update_supernav to silently abort,
+        leaving the supernav showing outdated version information.
+        """
+        # Arrange
+        from ..models import OS, update_supernav
+        from boxes.models import Box
+
+        # Create an OS without any release files
+        OS.objects.create(name="Android", slug="android")
+
+        # Create download files for other operating systems
+        for os, slug in [
+            (self.osx, "python3.10-macos"),
+            (self.linux, "python3.10-linux"),
+            (self.windows, "python3.10-windows"),
+        ]:
+            ReleaseFile.objects.create(
+                os=os,
+                release=self.python_3,
+                slug=slug,
+                name="Python 3.10",
+                url=f"/ftp/python/{slug}.zip",
+                download_button=True,
+            )
+
+        # Act
+        update_supernav()
+
+        # Assert: verify supernav was updated
+        box = Box.objects.get(label="supernav-python-downloads")
+        content = box.content.rendered
+
+        # OSes with files should be present
+        self.assertIn('class="download-os-windows"', content)
+        self.assertIn('class="download-os-macos"', content)
+        self.assertIn('class="download-os-linux"', content)
+
+        # Android (no files) should not be present
+        self.assertNotIn("android", content.lower())

downloads/tests/test_template_tags.py

@@ -0,0 +1,170 @@
+import unittest.mock as mock
+
+import requests
+from django.core.cache import cache
+from django.test import TestCase, override_settings
+from django.urls import reverse
+
+from ..templatetags.download_tags import get_eol_info, get_python_releases_data
+from .base import BaseDownloadTests
+
+MOCK_PYTHON_RELEASE = {
+    "metadata": {
+        "2.7": {"status": "end-of-life", "end_of_life": "2020-01-01"},
+        "3.8": {"status": "end-of-life", "end_of_life": "2024-10-07"},
+        "3.10": {"status": "security", "end_of_life": "2026-10-04"},
+    }
+}
+
+
+TEST_CACHES = {
+    "default": {
+        "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+        "LOCATION": "test-cache",
+    }
+}
+
+
+@override_settings(CACHES=TEST_CACHES)
+class GetEOLInfoTests(BaseDownloadTests):
+    def setUp(self):
+        super().setUp()
+        cache.clear()
+
+    @mock.patch("downloads.templatetags.download_tags.get_python_releases_data")
+    def test_eol_status(self, mock_get_data):
+        """Test get_eol_info returns correct EOL status."""
+        # Arrange
+        mock_get_data.return_value = MOCK_PYTHON_RELEASE
+        tests = [
+            (self.release_275, True, "2020-01-01"),  # EOL
+            (self.python_3_8_20, True, "2024-10-07"),  # EOL
+            (self.python_3_10_18, False, None),  # security
+        ]
+
+        for release, expected_is_eol, expected_eol_date in tests:
+            with self.subTest(release=release.name):
+                # Act
+                result = get_eol_info(release)
+
+                # Assert
+                self.assertEqual(result["is_eol"], expected_is_eol)
+                self.assertEqual(result["eol_date"], expected_eol_date)
+
+    @mock.patch("downloads.templatetags.download_tags.get_python_releases_data")
+    def test_eol_status_api_failure(self, mock_get_data):
+        """Test that API failure results in not showing EOL warning."""
+        # Arrange
+        mock_get_data.return_value = None
+
+        # Act
+        result = get_eol_info(self.python_3_8_20)
+
+        # Assert
+        self.assertFalse(result["is_eol"])
+        self.assertIsNone(result["eol_date"])
+
+
+@override_settings(CACHES=TEST_CACHES)
+class GetReleaseCycleDataTests(TestCase):
+    def setUp(self):
+        cache.clear()
+
+    @mock.patch("downloads.templatetags.download_tags.requests.get")
+    def test_successful_fetch(self, mock_get):
+        """Test successful API fetch."""
+        # Arrange
+        mock_response = mock.Mock()
+        mock_response.json.return_value = MOCK_PYTHON_RELEASE
+        mock_response.raise_for_status = mock.Mock()
+        mock_get.return_value = mock_response
+
+        # Act
+        result = get_python_releases_data()
+
+        # Assert
+        self.assertEqual(result, MOCK_PYTHON_RELEASE)
+        mock_get.assert_called_once()
+
+    @mock.patch("downloads.templatetags.download_tags.requests.get")
+    def test_caches_result(self, mock_get):
+        """Test that the result is cached."""
+        # Arrange
+        mock_response = mock.Mock()
+        mock_response.json.return_value = MOCK_PYTHON_RELEASE
+        mock_response.raise_for_status = mock.Mock()
+        mock_get.return_value = mock_response
+
+        # Act
+        result1 = get_python_releases_data()
+        result2 = get_python_releases_data()
+
+        # Assert
+        self.assertEqual(result1, result2)
+        mock_get.assert_called_once()
+
+    @mock.patch("downloads.templatetags.download_tags.requests.get")
+    def test_request_exception_returns_none(self, mock_get):
+        """Test that request exceptions return None."""
+        # Arrange
+        mock_get.side_effect = requests.RequestException("Connection error")
+
+        # Act
+        result = get_python_releases_data()
+
+        # Assert
+        self.assertIsNone(result)
+
+    @mock.patch("downloads.templatetags.download_tags.requests.get")
+    def test_json_decode_error_returns_none(self, mock_get):
+        """Test that JSON decode errors return None."""
+        # Arrange
+        mock_response = mock.Mock()
+        mock_response.raise_for_status = mock.Mock()
+        mock_response.json.side_effect = ValueError("Invalid JSON")
+        mock_get.return_value = mock_response
+
+        # Act
+        result = get_python_releases_data()
+
+        # Assert
+        self.assertIsNone(result)
+
+
+@override_settings(CACHES=TEST_CACHES)
+class EOLBannerViewTests(BaseDownloadTests):
+
+    def setUp(self):
+        super().setUp()
+        cache.clear()
+
+    @mock.patch("downloads.templatetags.download_tags.get_python_releases_data")
+    def test_eol_banner_visibility(self, mock_get_data):
+        """Test EOL banner is shown or hidden correctly."""
+        # Arrange
+        tests = [
+            ("release_275", MOCK_PYTHON_RELEASE, True),
+            ("python_3_8_20", MOCK_PYTHON_RELEASE, True),
+            ("python_3_10_18", MOCK_PYTHON_RELEASE, False),
+            ("python_3_8_20", None, False),
+        ]
+
+        for release_attr, mock_data, expect_banner in tests:
+            with self.subTest(release=release_attr):
+                mock_get_data.return_value = mock_data
+                release = getattr(self, release_attr)
+                url = reverse(
+                    "download:download_release_detail",
+                    kwargs={"release_slug": release.slug},
+                )
+
+                # Act
+                response = self.client.get(url)
+
+                # Assert
+                self.assertEqual(response.status_code, 200)
+                if expect_banner:
+                    self.assertContains(response, "level-error")
+                    self.assertContains(response, "no longer supported")
+                else:
+                    self.assertNotContains(response, "level-error")