Merge branch 'main' into django-5.2

Author: JacobCoffee

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   migrations:
-    if: github.event_name != 'push' || github.event.repository.fork == true
+    if: github.event_name != 'push' || github.event.repository.fork == true || github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -40,7 +40,7 @@ jobs:
           DATABASE_URL: postgres://postgres:postgres@localhost:5432/pythonorg
 
   test:
-    if: github.event_name != 'push' || github.event.repository.fork == true
+    if: github.event_name != 'push' || github.event.repository.fork == true || github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -92,4 +92,4 @@ jobs:
           DATABASE_URL: postgres://postgres:postgres@localhost:5432/pythonorg
 
       - name: Check coverage
-        run: coverage report -m --fail-under=75
+        run: coverage report -m --fail-under=75

.github/workflows/static.yml

@@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   collectstatic:
-    if: github.event_name != 'push' || github.event.repository.fork == true
+    if: github.event_name != 'push' || github.event.repository.fork == true || github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository

downloads/templatetags/download_tags.py

@@ -80,6 +80,16 @@ def has_sbom(files):
     return any(f.sbom_spdx2_file for f in files)
 
 
+@register.filter
+def has_md5(files):
+    return any(f.md5_sum for f in files)
+
+
+@register.filter
+def has_sha256(files):
+    return any(f.sha256_sum for f in files)
+
+
 @register.filter
 def sort_windows(files):
     if not files:

downloads/views.py

@@ -267,3 +267,17 @@ def item_pubdate(self, item: Release) -> datetime | None:
                 return timezone.make_aware(item.release_date)
             return item.release_date
         return None
+
+
+class ReleaseEditButton(TemplateView):
+    """Render the release edit button (shown only to staff users).
+
+    This endpoint is not cached, allowing the edit button to appear
+    for staff users even when the release page itself is cached.
+    """
+    template_name = "downloads/release_edit_button.html"
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["release_pk"] = self.kwargs["pk"]
+        return context

pydotorg/urls.py

@@ -8,6 +8,7 @@
 from django.conf import settings
 
 from cms.views import custom_404
+from downloads.views import ReleaseEditButton
 from users.views import HoneypotSignupView, CustomPasswordChangeView
 
 from . import views, urls_api
@@ -19,6 +20,7 @@
     path('', views.IndexView.as_view(), name='home'),
     re_path(r'^_health/?', views.health, name='health'),
     path('authenticated', views.AuthenticatedView.as_view(), name='authenticated'),
+    path('release-edit-button/<int:pk>', ReleaseEditButton.as_view(), name='release_edit_button'),
     path('humans.txt', TemplateView.as_view(template_name='humans.txt', content_type='text/plain')),
     path('robots.txt', TemplateView.as_view(template_name='robots.txt', content_type='text/plain')),
     path('funding.json', views.serve_funding_json, name='funding_json'),

templates/base.html

@@ -129,7 +129,7 @@
     <div id="touchnav-wrapper">
 
         <div id="nojs" class="do-not-print">
-            <p><strong>Notice:</strong> While JavaScript is not essential for this website, your interaction with the content will be limited. Please turn JavaScript on for the full experience. </p>
+            <p><strong>Notice:</strong> This page displays a fallback because interactive scripts did not run. Possible causes include disabled JavaScript or failure to load scripts or stylesheets.</p>
         </div>
 
         <!-- Sister Site Links -->

templates/downloads/release_detail.html

@@ -4,6 +4,8 @@
 {% load has_gpg from download_tags %}
 {% load has_sigstore_materials from download_tags %}
 {% load has_sbom from download_tags %}
+{% load has_md5 from download_tags %}
+{% load has_sha256 from download_tags %}
 {% load sort_windows from download_tags %}
 {% load get_eol_info from download_tags %}
 
@@ -22,9 +24,7 @@
 
 {% block content %}
     <article class="text">
-        {% if request.user.is_staff %}
-        <a role="button" class="button" href="{% url 'admin:downloads_release_change' release.pk %}">Edit this release</a>
-        {% endif %}
+        <span data-html-include="{% url 'release_edit_button' release.pk %}"></span>
 
         <header class="article-header">
             <h1 class="page-title">{{ release.name }}</h1>
@@ -85,11 +85,9 @@ <h3>{{ f.os.name }}</h3>
           <thead>
             <tr>
               <th>Version</th>
-              <th>Operating System</th>
+              <th>Operating system</th>
               <th>Description</th>
-              <th>MD5 Checksum</th>
-              <th>SHA256 Checksum</th>
-              <th>File Size</th>
+              <th>File size</th>
               {% if release_files|has_sigstore_materials %}
               <th colspan="2"><a href="https://www.python.org/download/sigstore/">Sigstore</a></th>
               {% endif %}
@@ -99,6 +97,11 @@ <h3>{{ f.os.name }}</h3>
               {% if release_files|has_gpg %}
               <th><a href="https://www.python.org/downloads/#gpg">GPG</a></th>
               {% endif %}
+              {% if release_files|has_sha256 %}
+              <th>SHA-256 checksum</th>
+              {% elif release_files|has_md5 %}
+              <th>MD5 checksum</th>
+              {% endif %}
             </tr>
           </thead>
           <tbody>
@@ -107,8 +110,6 @@ <h3>{{ f.os.name }}</h3>
                 <td><a href="{{ f.url }}">{{ f.name }}</a></td>
                 <td>{{ f.os.name }}</td>
                 <td>{{ f.description }}</td>
-                <td>{{ f.md5_sum }}</td>
-                <td>{{ f.sha256_sum|default:"n/a" }}</td>
                 <td>{{ f.filesize|filesizeformat }}</td>
                 {% if release_files|has_sigstore_materials %}
                   {% if f.sigstore_bundle_file %}
@@ -124,6 +125,11 @@ <h3>{{ f.os.name }}</h3>
                 {% if release_files|has_gpg %}
                 <td>{% if f.gpg_signature_file %}<a href="{{ f.gpg_signature_file }}">SIG</a>{% endif %}</td>
                 {% endif %}
+                {% if release_files|has_sha256 %}
+                <td>{{ f.sha256_sum }}</td>
+                {% elif release_files|has_md5 %}
+                <td>{{ f.md5_sum }}</td>
+                {% endif %}
               </tr>
             {% endfor %}
           </tbody>

templates/downloads/release_edit_button.html

@@ -0,0 +1,3 @@
+{% if request.user.is_staff %}
+<a role="button" class="button" href="{% url 'admin:downloads_release_change' release_pk %}">Edit this release</a>
+{% endif %}