Merge remote-tracking branch 'origin/main' into nominations-supporting-statements

# Conflicts:
#	apps/nominations/views.py

Author: JacobCoffee

apps/downloads/migrations/0016_release_notes_url_hg_to_github.py

@@ -0,0 +1,51 @@
+"""Rewrite dead hg.python.org release notes URLs to their GitHub equivalents."""
+
+import re
+
+from django.db import migrations
+
+HG_URL_RE = re.compile(r"^https?://hg\.python\.org/cpython/(?:raw-)?file/(?P<ref>[^/]+)/(?P<path>.+)$")
+GITHUB_BLOB_URL = "https://github.com/python/cpython/blob/{ref}/{path}"
+
+# Mercurial changesets do not exist in git; map the ones stored in production
+# to the git ref for the same release.
+HG_CHANGESET_TO_GIT_REF = {
+    "15fc83c505e3": "b34ba3f174ced8b6534888179b2f22e0f006c26e",  # 2.3 (no v2.3 tag in git)
+    "e32e3a9f3902": "v2.7.7rc1",
+    "80ccce248ba2": "v2.7.10rc1",
+    "15c95b7d81dc": "v2.7.10",
+    "82dd9545bd93": "v2.7.11rc1",
+    "53d30ab403f1": "v2.7.11",
+}
+
+
+def github_url_for(hg_url):
+    match = HG_URL_RE.match(hg_url)
+    if match is None:
+        return None
+    ref = match["ref"]
+    if not ref.startswith("v"):
+        ref = HG_CHANGESET_TO_GIT_REF.get(ref)
+        if ref is None:
+            return None
+    return GITHUB_BLOB_URL.format(ref=ref, path=match["path"])
+
+
+def rewrite_hg_release_notes_urls(apps, schema_editor):
+    Release = apps.get_model("downloads", "Release")
+    db_alias = schema_editor.connection.alias
+    releases = Release.objects.using(db_alias).filter(release_notes_url__contains="hg.python.org")
+    for release in releases:
+        url = github_url_for(release.release_notes_url)
+        if url is not None:
+            Release.objects.using(db_alias).filter(pk=release.pk).update(release_notes_url=url)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("downloads", "0015_releasefile_python_dot_org_urls"),
+    ]
+
+    operations = [
+        migrations.RunPython(rewrite_hg_release_notes_urls, migrations.RunPython.noop),
+    ]

apps/nominations/models.py

@@ -245,10 +245,15 @@ def visible(self, user=None):
         if self.accepted and self.approved and not self.election.nominations_open:
             return True
 
-        if user is None:
+        if user is None or not user.is_authenticated:
             return False
 
-        return bool(user.is_staff or user == self.user)
+        if user.is_staff or user == self.user:
+            return True
+
+        # A nominator can see the person they nominated, so that the links
+        # in the nominee list preview work while nominations are open.
+        return self.nominations.filter(nominator=user, election=self.election).exists()
 
 
 class Nomination(models.Model):

apps/nominations/tests/test_views.py

@@ -390,3 +390,80 @@ def test_accept_404s_under_wrong_election(self):
 
     def test_edit_still_works_under_own_election(self):
         self.assertEqual(self.client.get(self._url("nominations:nomination_edit", self.election)).status_code, 200)
+
+
+class NomineeListPreviewTests(TestCase):
+    """While nominations are open, the list previews the nominees relevant to the user."""
+
+    def setUp(self):
+        self.nominator = UserFactory(first_name="Alan", last_name="Turing")
+        self.election = open_election("2026 Board Election")
+        self.other_election = open_election("2026 Packaging Council Election", kind=packaging_council_kind())
+
+        self.nominee = self._nominee(self.election, "Grace", "Hopper")
+        self._nomination(self.election, self.nominator, self.nominee)
+
+        # The same user is a candidate in an unrelated election.
+        self.nominator_as_nominee = Nominee.objects.create(user=self.nominator, election=self.other_election)
+        self._nomination(
+            self.other_election, UserFactory(first_name="Barbara", last_name="Liskov"), self.nominator_as_nominee
+        )
+
+        # Somebody else's nomination in the election under test.
+        self.unrelated_nominee = self._nominee(self.election, "Ada", "Lovelace")
+        self._nomination(self.election, UserFactory(first_name="Ken", last_name="Thompson"), self.unrelated_nominee)
+
+    def _nominee(self, election, first_name, last_name):
+        user = UserFactory(first_name=first_name, last_name=last_name)
+        return Nominee.objects.create(user=user, election=election)
+
+    def _nomination(self, election, nominator, nominee):
+        return Nomination.objects.create(
+            election=election,
+            nominator=nominator,
+            nominee=nominee,
+            name=f"{nominee.user.first_name} {nominee.user.last_name}",
+            email=nominee.user.email,
+            nomination_statement="A strong candidate.",
+        )
+
+    def _url(self, election):
+        return reverse("nominations:nominees_list", kwargs={"election": election.slug})
+
+    def test_preview_lists_people_the_user_nominated(self):
+        self.client.force_login(self.nominator)
+        response = self.client.get(self._url(self.election))
+        self.assertEqual(response.status_code, 200)
+        self.assertIn(self.nominee, response.context["object_list"])
+
+    def test_preview_excludes_other_elections(self):
+        self.client.force_login(self.nominator)
+        response = self.client.get(self._url(self.election))
+        self.assertNotIn(self.nominator_as_nominee, response.context["object_list"])
+
+    def test_preview_excludes_nominations_by_other_people(self):
+        self.client.force_login(self.nominator)
+        response = self.client.get(self._url(self.election))
+        self.assertNotIn(self.unrelated_nominee, response.context["object_list"])
+
+    def test_preview_ignores_nominations_filed_under_another_election(self):
+        # A nomination whose election disagrees with its nominee's (possible via the admin).
+        self._nomination(self.other_election, self.nominator, self.unrelated_nominee)
+        self.client.force_login(self.nominator)
+        response = self.client.get(self._url(self.election))
+        self.assertNotIn(self.unrelated_nominee, response.context["object_list"])
+
+    def test_preview_includes_the_user_as_a_candidate(self):
+        self.client.force_login(self.nominator)
+        response = self.client.get(self._url(self.other_election))
+        self.assertIn(self.nominator_as_nominee, response.context["object_list"])
+
+    def test_nominator_can_open_the_nominee_they_nominated(self):
+        self.client.force_login(self.nominator)
+        response = self.client.get(self.nominee.get_absolute_url())
+        self.assertEqual(response.status_code, 200)
+
+    def test_other_users_still_cannot_open_the_nominee(self):
+        self.client.force_login(UserFactory(first_name="Guido", last_name="van Rossum"))
+        response = self.client.get(self.nominee.get_absolute_url())
+        self.assertEqual(response.status_code, 404)

apps/nominations/views.py

@@ -4,6 +4,7 @@
 from django.contrib import messages
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.core.mail import send_mail
+from django.db.models import Q
 from django.http import Http404, JsonResponse
 from django.shortcuts import get_object_or_404
 from django.template.loader import render_to_string
@@ -75,7 +76,19 @@ def get_queryset(self, *args, **kwargs):
             return Nominee.objects.filter(accepted=True, approved=True, election=election).exclude(user=None)
 
         if self.request.user.is_authenticated:
-            return Nominee.objects.filter(user=self.request.user)
+            # Before the results are public, preview the nominees relevant to
+            # this user in this election: the people they nominated, plus
+            # themselves when somebody nominated them.
+            return (
+                Nominee.objects.filter(
+                    Q(user=self.request.user)
+                    | Q(nominations__nominator=self.request.user, nominations__election=election),
+                    election=election,
+                )
+                .exclude(user=None)
+                .distinct()
+                .select_related("user")
+            )
         return None
 
 

apps/pages/templatetags/__init__.py

@@ -0,0 +1 @@
+"""Template tags for the pages app."""

apps/pages/templatetags/pages.py

@@ -0,0 +1,39 @@
+"""Template filters for rendering CMS page content."""
+
+import re
+from collections import Counter
+
+from dateutil import parser as date_parser
+from django import template
+from django.utils.html import mark_safe
+
+register = template.Library()
+
+_MONTH = r"(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[a-z]*\.?"
+# A board resolution is a <blockquote> followed by a paragraph with its vote date, e.g.
+# "Approved; 9-0-1, 2026-08-12", "Declined 3-4-0, December 2, 2014", "September 4, 2018".
+_RESOLUTION_RE = re.compile(
+    r"<blockquote>(?P<body>(?:(?!<blockquote>).)*?</blockquote>\s*<p>[^<]*?)"
+    rf"(?P<date>\d{{4}}-\d\d-\d\d|{_MONTH}\s+\d{{1,2}},?\s+\d{{4}}|\d{{1,2}}\s+{_MONTH},?\s+\d{{4}})",
+    re.DOTALL,
+)
+
+
+@register.filter
+def resolution_anchors(content):
+    """Anchor each board resolution at its vote date and turn that date into a link to it.
+
+    Ids are ISO dates; later resolutions on the same date get ``-2``, ``-3``, ... in page order.
+    """
+    seen = Counter()
+
+    def anchor(match):
+        try:
+            date = date_parser.parse(match["date"]).date().isoformat()
+        except ValueError:
+            return match[0]
+        seen[date] += 1
+        anchor_id = date if seen[date] == 1 else f"{date}-{seen[date]}"
+        return f'<blockquote id="{anchor_id}">{match["body"]}<a href="#{anchor_id}">{match["date"]}</a>'
+
+    return mark_safe(_RESOLUTION_RE.sub(anchor, str(content)))  # noqa: S308

apps/pages/tests/test_templatetags.py

@@ -0,0 +1,34 @@
+from django.test import SimpleTestCase
+
+from apps.pages.templatetags.pages import resolution_anchors
+
+
+class ResolutionAnchorsTests(SimpleTestCase):
+    def test_ids_from_vote_dates(self):
+        """Each resolution is keyed by its vote date, numbered in page order when a date repeats."""
+        html = (
+            "<blockquote>A</blockquote>\n<p>Approved; 9-0-1, 2026-08-12</p>\n"
+            "<blockquote>B</blockquote>\n<p>Approved; 9-0-0, 2026-08-12</p>\n"
+            "<blockquote>C</blockquote>\n<p>Declined 3-4-0, December 2, 2014</p>\n"
+            "<blockquote>D</blockquote>\n<p>Approved, 10-0-0 by IRC vote, 8 June 2015.</p>\n"
+            "<blockquote>E</blockquote>\n<p>September 4, 2018</p>"
+        )
+        self.assertHTMLEqual(
+            resolution_anchors(html),
+            '<blockquote id="2026-08-12">A</blockquote><p>Approved; 9-0-1, <a href="#2026-08-12">2026-08-12</a></p>'
+            '<blockquote id="2026-08-12-2">B</blockquote><p>Approved; 9-0-0, <a href="#2026-08-12-2">2026-08-12</a></p>'
+            '<blockquote id="2014-12-02">C</blockquote><p>Declined 3-4-0, <a href="#2014-12-02">December 2, 2014</a></p>'
+            '<blockquote id="2015-06-08">D</blockquote>'
+            '<p>Approved, 10-0-0 by IRC vote, <a href="#2015-06-08">8 June 2015</a>.</p>'
+            '<blockquote id="2018-09-04">E</blockquote><p><a href="#2018-09-04">September 4, 2018</a></p>',
+        )
+
+    def test_unmatched_content_unchanged(self):
+        """Paragraphs after a quote without a full date, and dated paragraphs not after a quote, are left alone."""
+        html = (
+            "<blockquote>A</blockquote><p>Approved, 10-0-0, May 2010.</p>"
+            "<blockquote>B</blockquote><p>with:</p>"
+            "<p>Approved; 9-0-0, 2026-08-12</p>"
+            "<blockquote>C</blockquote><p>Approved 5-0-0, Feb 30, 2014</p>"
+        )
+        self.assertHTMLEqual(resolution_anchors(html), html)

apps/sponsors/models/benefits.py

@@ -316,12 +316,6 @@ def user_edit_url(self):
         url = reverse("users:update_sponsorship_assets", args=[self.sponsor_benefit.sponsorship.pk])
         return url + f"?required_asset={self.pk}"
 
-    @property
-    def user_view_url(self):
-        """Return the URL for sponsors to view this provided asset."""
-        url = reverse("users:view_provided_sponsorship_assets", args=[self.sponsor_benefit.sponsorship.pk])
-        return url + f"?provided_asset={self.pk}"
-
 
 class RequiredAssetMixin(AssetMixin):
     """Mixin for required assets submitted by the user.

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

@@ -8,7 +8,7 @@
 {% cache 86400 CACHED_DOWNLOAD_SPONSORS_LIST %}
   <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;">
+  <div style="display: grid; gap: 2.5rem; grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); align-items: center; justify-content: center; margin-top: 1.5em;">
   {% for sponsorship in sponsorships %}
     <div style="text-align: center;">
       <a href="{{ sponsorship.sponsor.landing_page_url }}" rel="sponsored noopener" target="_blank" style="border-bottom: 0;">
@@ -30,7 +30,7 @@ <h2 class="widget-title" style="text-align: center;">Sponsors</h2>
 {% comment %}cache for 1 day{% endcomment %}
 {% cache 86400 CACHED_JOBS_SPONSORS_LIST %}
   <h3 class="widget-title">Job Board Sponsors</h3>
-  <div style="display: grid; grid-gap: 1em; grid-template-columns: repeat(auto-fit, minmax(100px, 0fr)); grid-template-rows: repeat(1, minmax(50px, 0fr)); align-items: center; justify-content: center; margin-top: 1em;">
+  <div style="display: grid; gap: 1rem; grid-template-columns: repeat(auto-fit, minmax(100px, 1fr)); align-items: center; justify-content: center; margin-top: 1em;">
   {% for sponsorship in sponsorships %}
     <div>
       {% if sponsorship.sponsor.web_logo.name|lower|slice:"-4:" == ".svg" %}
@@ -51,14 +51,14 @@ <h3 class="widget-title">Job Board Sponsors</h3>
 
   {% for package, placement_info in sponsorships_by_package.items %}
   {% if placement_info.sponsorships %}
-  <div title="{{ package }} Sponsors" align="center">
+  <div title="{{ package }} Sponsors" align="center"{% if not forloop.last %} style="margin-bottom: 3rem;"{% endif %}>
     {% with dimension=placement_info.logo_dimension %}
 
     <h1 style="font-size: {% if forloop.first %}350%{% else %}300%{% endif %}">{{ placement_info.label }} Sponsors</h1>
 
-    <div style="display: grid; grid-gap: 2em; grid-template-columns: repeat(auto-fit, minmax({{ dimension }}px, 0fr)); grid-template-rows: repeat(1, minmax({{ dimension }}px, 0fr)); align-items: center; justify-content: center;">
+    <div style="display: grid; gap: 2.5rem; grid-template-columns: repeat(auto-fit, minmax({{ dimension }}px, 1fr)); align-items: center; justify-content: center;">
       {% for sponsorship in placement_info.sponsorships %}
-        <div id="{{ sponsorship.sponsor.slug }}" data-internal-year={{ sponsorship.year }}>
+        <div id="{{ sponsorship.sponsor.slug }}" data-internal-year="{{ sponsorship.year|default_if_none:'' }}">
             <div
                 data-ea-publisher="psf"
                 data-ea-type="psf-image-only"

apps/sponsors/templatetags/sponsors.py

@@ -97,9 +97,10 @@ def ideal_size(image, ideal_dimension):
     ideal_dimension = int(ideal_dimension)
     try:
         w, h = image.width, image.height
-    except FileNotFoundError:
-        # local dev doesn't have all images if DB is a copy from prod environment
-        # this is just a fallback to return ideal_dimension instead
+    except (FileNotFoundError, ValueError):
+        # FileNotFoundError: local dev doesn't have all images if DB is a copy from prod environment.
+        # ValueError: no file is associated with the field.
+        # Size as a square logo would be instead of erroring.
         w, h = ideal_dimension, ideal_dimension
 
     return int(w * math.sqrt((100 * ideal_dimension) / (w * h)))