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

Author: iampujan

.github/workflows/purge-cache.yml

@@ -18,11 +18,27 @@ permissions: {}
 jobs:
   purge:
     runs-on: ubuntu-latest
-    env:
-      KEY: ${{ inputs.target || 'pydotorg-app' }}
     steps:
-      - name: Purge ${{ env.KEY }}
+      - uses: actions/checkout@v6
+        if: github.event_name == 'push'
+        with:
+          fetch-depth: 0
+
+      - name: Resolve keys
+        id: keys
+        run: |
+          if [ -n "${{ inputs.target }}" ]; then
+            echo "keys=${{ inputs.target }}" >> "$GITHUB_OUTPUT"
+          elif git diff --name-only ${{ github.event.before }}..${{ github.sha }} | grep -qE '^(static/|templates/)'; then
+            echo "keys=pydotorg-app" >> "$GITHUB_OUTPUT"
+          else
+            echo "keys=$(git diff --name-only ${{ github.event.before }}..${{ github.sha }} | grep -oP '^apps/\K[^/]+(?=/(templates|static)/)' | sort -u | tr '\n' ' ')" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Purge ${{ steps.keys.outputs.keys || 'pydotorg-app' }}
         run: |
-          curl -fsS -X POST \
-            "https://api.fastly.com/service/${{ secrets.FASTLY_SERVICE_ID }}/purge/${{ env.KEY }}" \
-            -H "Fastly-Key: ${{ secrets.FASTLY_API_KEY }}"
+          for KEY in ${{ steps.keys.outputs.keys || 'pydotorg-app' }}; do
+            curl -fsS -X POST \
+              "https://api.fastly.com/service/${{ secrets.FASTLY_SERVICE_ID }}/purge/$KEY" \
+              -H "Fastly-Key: ${{ secrets.FASTLY_API_KEY }}"
+          done

apps/downloads/models.py

@@ -5,7 +5,7 @@
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.db.models.signals import post_save
+from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
 from django.template.loader import render_to_string
 from django.urls import reverse
@@ -332,6 +332,31 @@ def update_download_supernav_and_boxes(sender, instance, **kwargs):
         update_homepage_download_box()
 
 
+def _update_boxes_for_release_file(instance):
+    """Update supernav and download boxes if the file's release is published."""
+    if instance.release_id and instance.release.is_published:
+        update_supernav()
+        update_download_landing_sources_box()
+        update_homepage_download_box()
+        purge_url("/box/supernav-python-downloads/")
+        purge_url("/box/homepage-downloads/")
+        purge_url("/box/download-sources/")
+
+
+@receiver(post_save, sender="downloads.ReleaseFile")
+def update_boxes_on_release_file_save(sender, instance, **kwargs):
+    """Refresh supernav when a release file is added or changed."""
+    if kwargs.get("raw", False):
+        return
+    _update_boxes_for_release_file(instance)
+
+
+@receiver(post_delete, sender="downloads.ReleaseFile")
+def update_boxes_on_release_file_delete(sender, instance, **kwargs):
+    """Refresh supernav when a release file is deleted."""
+    _update_boxes_for_release_file(instance)
+
+
 class ReleaseFile(ContentManageable, NameSlugModel):
     """Individual files in a release.
 
@@ -361,7 +386,7 @@ class ReleaseFile(ContentManageable, NameSlugModel):
 
     def validate_unique(self, exclude=None):
         """Ensure only one release file per OS has the download button enabled."""
-        if self.download_button:
+        if self.download_button and self.release_id:
             qs = ReleaseFile.objects.filter(release=self.release, os=self.os, download_button=True).exclude(pk=self.id)
             if qs.count() > 0:
                 msg = 'Only one Release File per OS can have "Download button" enabled'

apps/downloads/tests/test_models.py

@@ -1,4 +1,5 @@
 import datetime as dt
+from unittest.mock import patch
 
 from apps.downloads.models import Release, ReleaseFile
 from apps.downloads.tests.base import BaseDownloadTests
@@ -232,3 +233,59 @@ def test_update_supernav_skips_os_without_files(self):
 
         # Android (no files) should not be present
         self.assertNotIn("android", content.lower())
+
+    @patch("apps.downloads.models.update_supernav")
+    @patch("apps.downloads.models.update_download_landing_sources_box")
+    @patch("apps.downloads.models.update_homepage_download_box")
+    def test_release_file_save_triggers_box_updates(self, mock_home, mock_sources, mock_supernav):
+        """Saving a ReleaseFile on a published release should update boxes."""
+        mock_supernav.reset_mock()
+        mock_sources.reset_mock()
+        mock_home.reset_mock()
+
+        ReleaseFile.objects.create(
+            os=self.windows,
+            release=self.python_3,
+            name="Windows installer",
+            url="/ftp/python/3.10.19/python-3.10.19.exe",
+            download_button=True,
+        )
+
+        mock_supernav.assert_called()
+        mock_sources.assert_called()
+        mock_home.assert_called()
+
+    @patch("apps.downloads.models.update_supernav")
+    @patch("apps.downloads.models.update_download_landing_sources_box")
+    @patch("apps.downloads.models.update_homepage_download_box")
+    def test_release_file_save_skips_unpublished_release(self, mock_home, mock_sources, mock_supernav):
+        """Saving a ReleaseFile on a draft release should not update boxes."""
+        mock_supernav.reset_mock()
+        mock_sources.reset_mock()
+        mock_home.reset_mock()
+
+        ReleaseFile.objects.create(
+            os=self.windows,
+            release=self.draft_release,
+            name="Windows installer draft",
+            url="/ftp/python/9.7.2/python-9.7.2.exe",
+        )
+
+        mock_supernav.assert_not_called()
+        mock_sources.assert_not_called()
+        mock_home.assert_not_called()
+
+    @patch("apps.downloads.models.update_supernav")
+    @patch("apps.downloads.models.update_download_landing_sources_box")
+    @patch("apps.downloads.models.update_homepage_download_box")
+    def test_release_file_delete_triggers_box_updates(self, mock_home, mock_sources, mock_supernav):
+        """Deleting a ReleaseFile on a published release should update boxes."""
+        mock_supernav.reset_mock()
+        mock_sources.reset_mock()
+        mock_home.reset_mock()
+
+        self.release_275_windows_32bit.delete()
+
+        mock_supernav.assert_called()
+        mock_sources.assert_called()
+        mock_home.assert_called()

apps/sponsors/templates/sponsors/partials/sponsors-list.html

@@ -6,13 +6,20 @@
 {% if logo_place == "download" %}
 {% comment %}cache for 1 day{% endcomment %}
 {% cache 86400 CACHED_DOWNLOAD_SPONSORS_LIST %}
-  <h2 class="widget-title">Sponsors</h2>
-  <p>Visionary sponsors help to host Python downloads.</p>
+  <h2 class="widget-title" style="text-align: center;">Sponsors</h2>
+  <p style="text-align: center;">Visionary sponsors help to host Python downloads.</p>
+  <div style="display: grid; grid-gap: 2em; grid-template-columns: repeat(auto-fit, minmax(150px, 0fr)); align-items: center; justify-content: center; margin-top: 1.5em;">
   {% for sponsorship in sponsorships %}
-  {% thumbnail sponsorship.sponsor.web_logo "x200" format="PNG" quality=100 as im %}
-    <img src="{{ im.url }}" alt="{{ sponsorship.sponsor.name }} logo" style="max-height:200px;max-width:200px;height:auto;width:auto;">
+  {% thumbnail sponsorship.sponsor.web_logo "x150" format="PNG" quality=100 as im %}
+    <div style="text-align: center;">
+      <a href="{{ sponsorship.sponsor.landing_page_url }}" rel="sponsored noopener" target="_blank" style="border-bottom: 0;">
+        <img src="{{ im.url }}" alt="{{ sponsorship.sponsor.name }} logo" style="max-height:150px;max-width:150px;height:auto;width:auto;">
+      </a>
+      <p style="margin-top: 0.5em; margin-bottom: 0; font-size: 0.875em; color: #4d4d4d;">{{ sponsorship.sponsor.name }}</p>
+    </div>
   {% endthumbnail %}
   {% endfor %}
+  </div>
 {% endcache CACHED_DOWNLOAD_SPONSORS_LIST %}
 
 {% elif logo_place == "jobs" %}