Merge branch 'main' into sha256-release-pydotorg

Author: JacobCoffee

downloads/admin.py

@@ -31,3 +31,6 @@ def formfield_for_dbfield(self, db_field, request, **kwargs):
         if db_field.name == "name":
             field.widget.attrs["placeholder"] = "Python 3.X.YaN"
         return field
+
+    class Media:
+        js = ["js/admin/releaseAdmin.js"]

downloads/managers.py

@@ -35,6 +35,9 @@ def latest_python3(self, minor_version: int | None = None):
         pattern = rf"^Python 3\.{minor_version}\."
         return self.python3().filter(name__regex=pattern).order_by("-release_date")
 
+    def latest_prerelease(self):
+        return self.python3().filter(pre_release=True).order_by("-release_date")
+
     def latest_pymanager(self):
         return self.pymanager().filter(is_latest=True)
 
@@ -52,5 +55,8 @@ def latest_python2(self):
     def latest_python3(self, minor_version: int | None = None):
         return self.get_queryset().latest_python3(minor_version).first()
 
+    def latest_prerelease(self):
+        return self.get_queryset().latest_prerelease().first()
+
     def latest_pymanager(self):
         return self.get_queryset().latest_pymanager().first()

downloads/models.py

@@ -298,6 +298,7 @@ def purge_fastly_download_pages(sender, instance, **kwargs):
             match = re.match(r'^3\.(\d+)', version)
             if match:
                 purge_url(f'/downloads/latest/python3.{match.group(1)}/')
+        purge_url('/downloads/latest/prerelease/')
         purge_url('/downloads/latest/pymanager/')
         purge_url('/downloads/macos/')
         purge_url('/downloads/source/')

downloads/tests/test_models.py

@@ -74,6 +74,28 @@ def test_latest_python3(self):
         latest_3_99 = Release.objects.latest_python3(minor_version=99)
         self.assertIsNone(latest_3_99)
 
+    def test_latest_prerelease(self):
+        latest_prerelease = Release.objects.latest_prerelease()
+        self.assertEqual(latest_prerelease, self.pre_release)
+
+        # Create a newer prerelease with a future date
+        newer_prerelease = Release.objects.create(
+            version=Release.PYTHON3,
+            name="Python 3.9.99",
+            is_published=True,
+            pre_release=True,
+            release_date=self.pre_release.release_date + dt.timedelta(days=1),
+        )
+        latest_prerelease = Release.objects.latest_prerelease()
+        self.assertEqual(latest_prerelease, newer_prerelease)
+        self.assertNotEqual(latest_prerelease, self.pre_release)
+
+    def test_latest_prerelease_when_no_prerelease(self):
+        # Delete the prerelease
+        self.pre_release.delete()
+        latest_prerelease = Release.objects.latest_prerelease()
+        self.assertIsNone(latest_prerelease)
+
     def test_get_version(self):
         self.assertEqual(self.release_275.name, 'Python 2.7.5')
         self.assertEqual(self.release_275.get_version(), '2.7.5')

downloads/tests/test_views.py

@@ -46,6 +46,37 @@ def test_download_release_detail(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 404)
 
+    def test_download_release_detail_not_superseded(self):
+        """Test that latest releases and Python 2 do not show a superseded notice."""
+        for release in [self.python_3, self.python_3_8_20, self.release_275]:
+            with self.subTest(release=release.name):
+                url = reverse(
+                    "download:download_release_detail",
+                    kwargs={"release_slug": release.slug},
+                )
+                response = self.client.get(url)
+                self.assertEqual(response.status_code, 200)
+                self.assertNotIn("latest_in_series", response.context)
+                self.assertNotContains(response, "has been superseded by")
+
+    def test_download_release_detail_superseded(self):
+        """Test that older releases show a superseded notice."""
+        tests = [
+            (self.python_3_10_18, self.python_3),
+            (self.python_3_8_19, self.python_3_8_20),
+        ]
+        for old_release, latest_release in tests:
+            with self.subTest(release=old_release.name):
+                url = reverse(
+                    "download:download_release_detail",
+                    kwargs={"release_slug": old_release.slug},
+                )
+                response = self.client.get(url)
+                self.assertEqual(response.status_code, 200)
+                self.assertEqual(response.context["latest_in_series"], latest_release)
+                self.assertContains(response, "has been superseded by")
+                self.assertContains(response, latest_release.name)
+
     def test_download_os_list(self):
         url = reverse('download:download_os_list', kwargs={'slug': self.linux.slug})
         response = self.client.get(url)
@@ -95,6 +126,18 @@ def test_latest_python3x_redirects(self):
         response = self.client.get(url)
         self.assertRedirects(response, reverse("download:download"))
 
+    def test_latest_prerelease_redirect(self):
+        url = reverse("download:download_latest_prerelease")
+        response = self.client.get(url)
+        self.assertRedirects(response, self.pre_release.get_absolute_url())
+
+    def test_latest_prerelease_redirect_when_no_prerelease(self):
+        # Delete the prerelease to test fallback
+        self.pre_release.delete()
+        url = reverse("download:download_latest_prerelease")
+        response = self.client.get(url)
+        self.assertRedirects(response, reverse("download:download"))
+
     def test_redirect_page_object_to_release_detail_page(self):
         self.release_275.release_page = None
         self.release_275.save()

downloads/urls.py

@@ -6,6 +6,7 @@
     re_path(r'latest/python2/?$', views.DownloadLatestPython2.as_view(), name='download_latest_python2'),
     re_path(r'latest/python3/?$', views.DownloadLatestPython3.as_view(), name='download_latest_python3'),
     re_path(r'latest/python3\.(?P<minor>\d+)/?$', views.DownloadLatestPython3.as_view(), name='download_latest_python3x'),
+    re_path(r'latest/prerelease/?$', views.DownloadLatestPrerelease.as_view(), name='download_latest_prerelease'),
     re_path(r'latest/pymanager/?$', views.DownloadLatestPyManager.as_view(), name='download_latest_pymanager'),
     re_path(r'latest/?$', views.DownloadLatestPython3.as_view(), name='download_latest_python3'),
     path('operating-systems/', views.DownloadFullOSList.as_view(), name='download_full_os_list'),

downloads/views.py

@@ -1,5 +1,6 @@
 from typing import Any
 
+import re
 from datetime import datetime
 
 from django.db.models import Case, IntegerField, Prefetch, When
@@ -47,6 +48,23 @@ def get_redirect_url(self, **kwargs):
         return reverse("downloads:download")
 
 
+class DownloadLatestPrerelease(RedirectView):
+    """Redirect to latest Python 3 prerelease"""
+
+    permanent = False
+
+    def get_redirect_url(self, **kwargs):
+        try:
+            latest_prerelease = Release.objects.latest_prerelease()
+        except Release.DoesNotExist:
+            latest_prerelease = None
+
+        if latest_prerelease:
+            return latest_prerelease.get_absolute_url()
+        else:
+            return reverse("downloads:download")
+
+
 class DownloadLatestPyManager(RedirectView):
     """ Redirect to latest Python install manager release """
     permanent = False
@@ -199,6 +217,17 @@ def get_context_data(self, **kwargs):
             )
         )
 
+        # Find the latest release in the feature series (such as 3.14.x)
+        # to show a "superseded by" notice on older releases
+        version = self.object.get_version()
+        if version and self.object.version == Release.PYTHON3:
+            match = re.match(r"^3\.(\d+)", version)
+            if match:
+                minor_version = int(match.group(1))
+                latest_in_series = Release.objects.latest_python3(minor_version)
+                if latest_in_series and latest_in_series.pk != self.object.pk:
+                    context["latest_in_series"] = latest_in_series
+
         return context