Merge branch 'main' into rm-peps

Author: JacobCoffee

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Install platform dependencies
         run: |
           sudo apt -y update

.github/workflows/static.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
             python-version-file: '.python-version'

downloads/admin.py

@@ -25,3 +25,9 @@ class ReleaseAdmin(ContentManageableModelAdmin):
     list_filter = ['version', 'is_published', 'show_on_download_page']
     search_fields = ['name', 'slug']
     ordering = ['-release_date']
+
+    def formfield_for_dbfield(self, db_field, request, **kwargs):
+        field = super().formfield_for_dbfield(db_field, request, **kwargs)
+        if db_field.name == "name":
+            field.widget.attrs["placeholder"] = "Python 3.X.YaN"
+        return field

downloads/managers.py

@@ -29,8 +29,11 @@ def pymanager(self):
     def latest_python2(self):
         return self.python2().filter(is_latest=True)
 
-    def latest_python3(self):
-        return self.python3().filter(is_latest=True)
+    def latest_python3(self, minor_version: int | None = None):
+        if minor_version is None:
+            return self.python3().filter(is_latest=True)
+        pattern = rf"^Python 3\.{minor_version}\."
+        return self.python3().filter(name__regex=pattern).order_by("-release_date")
 
     def latest_pymanager(self):
         return self.pymanager().filter(is_latest=True)
@@ -44,22 +47,10 @@ def released(self):
 
 class ReleaseManager(Manager.from_queryset(ReleaseQuerySet)):
     def latest_python2(self):
-        qs = self.get_queryset().latest_python2()
-        if qs:
-            return qs[0]
-        else:
-            return None
-
-    def latest_python3(self):
-        qs = self.get_queryset().latest_python3()
-        if qs:
-            return qs[0]
-        else:
-            return None
+        return self.get_queryset().latest_python2().first()
+
+    def latest_python3(self, minor_version: int | None = None):
+        return self.get_queryset().latest_python3(minor_version).first()
 
     def latest_pymanager(self):
-        qs = self.get_queryset().latest_pymanager()
-        if qs:
-            return qs[0]
-        else:
-            return None
+        return self.get_queryset().latest_pymanager().first()

downloads/models.py

@@ -292,6 +292,12 @@ def purge_fastly_download_pages(sender, instance, **kwargs):
         purge_url('/downloads/feed.rss')
         purge_url('/downloads/latest/python2/')
         purge_url('/downloads/latest/python3/')
+        # Purge minor version specific URLs (like /downloads/latest/python3.14/)
+        version = instance.get_version()
+        if instance.version == Release.PYTHON3 and version:
+            match = re.match(r'^3\.(\d+)', version)
+            if match:
+                purge_url(f'/downloads/latest/python3.{match.group(1)}/')
         purge_url('/downloads/latest/pymanager/')
         purge_url('/downloads/macos/')
         purge_url('/downloads/source/')

downloads/tests/base.py

@@ -1,4 +1,4 @@
-import datetime
+import datetime as dt
 
 from django.test import TestCase
 from django.utils import timezone
@@ -32,7 +32,7 @@ def setUp(self):
             is_latest=True,
             is_published=True,
             release_page=self.release_275_page,
-            release_date=timezone.now() - datetime.timedelta(days=-1)
+            release_date=dt.datetime.fromisoformat("2013-05-15T00:00Z"),
         )
         self.release_275_windows_32bit = ReleaseFile.objects.create(
             os=self.windows,
@@ -102,9 +102,31 @@ def setUp(self):
 
         self.python_3 = Release.objects.create(
             version=Release.PYTHON3,
-            name='Python 3.10',
+            name="Python 3.10.19",
             is_latest=True,
             is_published=True,
             show_on_download_page=True,
-            release_page=self.release_275_page
+            release_page=self.release_275_page,
+            release_date=dt.datetime.fromisoformat("2025-10-09T00:00Z"),
+        )
+
+        self.python_3_10_18 = Release.objects.create(
+            version=Release.PYTHON3,
+            name="Python 3.10.18",
+            is_published=True,
+            release_date=dt.datetime.fromisoformat("2025-06-03T00:00Z"),
+        )
+
+        self.python_3_8_20 = Release.objects.create(
+            version=Release.PYTHON3,
+            name="Python 3.8.20",
+            is_published=True,
+            release_date=dt.datetime.fromisoformat("2024-09-06T00:00Z"),
+        )
+
+        self.python_3_8_19 = Release.objects.create(
+            version=Release.PYTHON3,
+            name="Python 3.8.19",
+            is_published=True,
+            release_date=dt.datetime.fromisoformat("2024-03-19T00:00Z"),
         )

downloads/tests/test_models.py

@@ -1,3 +1,5 @@
+import datetime as dt
+
 from ..models import Release, ReleaseFile
 from .base import BaseDownloadTests
 
@@ -10,14 +12,14 @@ def test_stringification(self):
 
     def test_published(self):
         published_releases = Release.objects.published()
-        self.assertEqual(len(published_releases), 4)
+        self.assertEqual(len(published_releases), 7)
         self.assertIn(self.release_275, published_releases)
         self.assertIn(self.hidden_release, published_releases)
         self.assertNotIn(self.draft_release, published_releases)
 
     def test_release(self):
         released_versions = Release.objects.released()
-        self.assertEqual(len(released_versions), 3)
+        self.assertEqual(len(released_versions), 6)
         self.assertIn(self.release_275, released_versions)
         self.assertIn(self.hidden_release, released_versions)
         self.assertNotIn(self.draft_release, released_versions)
@@ -37,7 +39,7 @@ def test_draft(self):
 
     def test_downloads(self):
         downloads = Release.objects.downloads()
-        self.assertEqual(len(downloads), 2)
+        self.assertEqual(len(downloads), 5)
         self.assertIn(self.release_275, downloads)
         self.assertNotIn(self.hidden_release, downloads)
         self.assertNotIn(self.draft_release, downloads)
@@ -50,12 +52,28 @@ def test_python2(self):
 
     def test_python3(self):
         versions = Release.objects.python3()
-        self.assertEqual(len(versions), 3)
+        self.assertEqual(len(versions), 6)
         self.assertNotIn(self.release_275, versions)
         self.assertNotIn(self.draft_release, versions)
         self.assertIn(self.hidden_release, versions)
         self.assertIn(self.pre_release, versions)
 
+    def test_latest_python3(self):
+        latest_3 = Release.objects.latest_python3()
+        self.assertEqual(latest_3, self.python_3)
+        self.assertNotEqual(latest_3, self.python_3_10_18)
+
+        latest_3_10 = Release.objects.latest_python3(minor_version=10)
+        self.assertEqual(latest_3_10, self.python_3)
+        self.assertNotEqual(latest_3_10, self.python_3_10_18)
+
+        latest_3_8 = Release.objects.latest_python3(minor_version=8)
+        self.assertEqual(latest_3_8, self.python_3_8_20)
+        self.assertNotEqual(latest_3_8, self.python_3_8_19)
+
+        latest_3_99 = Release.objects.latest_python3(minor_version=99)
+        self.assertIsNone(latest_3_99)
+
     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

@@ -56,6 +56,21 @@ def test_download(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
+    def test_download_releases_ordered_by_version(self):
+        url = reverse("download:download")
+        response = self.client.get(url)
+        releases = response.context["releases"]
+        self.assertEqual(
+            releases,
+            [
+                self.python_3,
+                self.python_3_10_18,
+                self.python_3_8_20,
+                self.python_3_8_19,
+                self.release_275,
+            ],
+        )
+
     def test_latest_redirects(self):
         latest_python2 = Release.objects.released().python2().latest()
         url = reverse('download:download_latest_python2')
@@ -67,6 +82,19 @@ def test_latest_redirects(self):
         response = self.client.get(url)
         self.assertRedirects(response, latest_python3.get_absolute_url())
 
+    def test_latest_python3x_redirects(self):
+        url = reverse("download:download_latest_python3x", kwargs={"minor": "10"})
+        response = self.client.get(url)
+        self.assertRedirects(response, self.python_3.get_absolute_url())
+
+        url = reverse("download:download_latest_python3x", kwargs={"minor": "8"})
+        response = self.client.get(url)
+        self.assertRedirects(response, self.python_3_8_20.get_absolute_url())
+
+        url = reverse("download:download_latest_python3x", kwargs={"minor": "99"})
+        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()
@@ -218,13 +246,13 @@ def test_get_release(self):
         self.assertEqual(response.status_code, 200)
         content = self.get_json(response)
         # 'self.draft_release' won't shown here.
-        self.assertEqual(len(content), 4)
+        self.assertEqual(len(content), 7)
 
         # Login to get all releases.
         response = self.client.get(url, headers={"authorization": self.Authorization})
         self.assertEqual(response.status_code, 200)
         content = self.get_json(response)
-        self.assertEqual(len(content), 5)
+        self.assertEqual(len(content), 8)
         self.assertFalse(content[0]['is_latest'])
 
     def test_post_release(self):
@@ -594,5 +622,5 @@ def test_feed_item_count(self) -> None:
         response = self.client.get(self.url)
         content = response.content.decode()
 
-        # In BaseDownloadTests, we create 5 releases, 4 of which are published, 1 of those published are hidden..
-        self.assertEqual(content.count("<item>"), 4)
+        # In BaseDownloadTests, we create 8 releases, 7 of which are published, 1 of those published are hidden..
+        self.assertEqual(content.count("<item>"), 7)

downloads/urls.py

@@ -5,6 +5,7 @@
 urlpatterns = [
     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/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

@@ -2,7 +2,7 @@
 
 from datetime import datetime
 
-from django.db.models import Prefetch
+from django.db.models import Case, IntegerField, Prefetch, When
 from django.urls import reverse
 from django.utils import timezone
 from django.views.generic import DetailView, TemplateView, ListView, RedirectView
@@ -30,19 +30,21 @@ def get_redirect_url(self, **kwargs):
 
 
 class DownloadLatestPython3(RedirectView):
-    """ Redirect to latest Python 3 release """
+    """Redirect to latest Python 3 release, optionally for a specific minor"""
+
     permanent = False
 
     def get_redirect_url(self, **kwargs):
+        minor_version = kwargs.get('minor')
         try:
-            latest_python3 = Release.objects.latest_python3()
-        except Release.DoesNotExist:
-            latest_python3 = None
+            minor_version_int = int(minor_version) if minor_version else None
+            latest_release = Release.objects.latest_python3(minor_version_int)
+        except (ValueError, Release.DoesNotExist):
+            latest_release = None
 
-        if latest_python3:
-            return latest_python3.get_absolute_url()
-        else:
-            return reverse('download')
+        if latest_release:
+            return latest_release.get_absolute_url()
+        return reverse("downloads:download")
 
 
 class DownloadLatestPyManager(RedirectView):
@@ -103,8 +105,17 @@ def get_context_data(self, **kwargs):
                 data['pymanager'] = latest_pymanager.download_file_for_os(o.slug)
             python_files.append(data)
 
+        def version_key(release: Release) -> tuple[int, ...]:
+            try:
+                return tuple(int(x) for x in release.get_version().split("."))
+            except ValueError:
+                return (0,)
+
+        releases = list(Release.objects.downloads())
+        releases.sort(key=version_key, reverse=True)
+
         context.update({
-            'releases': Release.objects.downloads(),
+            'releases': releases,
             'latest_python2': latest_python2,
             'latest_python3': latest_python3,
             'python_files': python_files,
@@ -157,6 +168,20 @@ def get_object(self):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
+        # Add featured files (files with download_button=True)
+        # Order: macOS first, Windows second, Source last
+        context['featured_files'] = self.object.files.filter(
+            download_button=True
+        ).annotate(
+            os_order=Case(
+                When(os__slug='macos', then=1),
+                When(os__slug='windows', then=2),
+                When(os__slug='source', then=3),
+                default=4,
+                output_field=IntegerField(),
+            )
+        ).order_by('os_order')
+
         # Manually add release files for better ordering
         context['release_files'] = []