Merge branch 'main' into sponsors-default-contact

Author: JacobCoffee

.github/ISSUE_TEMPLATE/BUG.yml

@@ -1,13 +1,13 @@
 name: "Bug Report"
-description: Report a bug with pyton.org website to help us improve
+description: Report a bug with python.org website to help us improve
 title: "Bug: <title>"
 labels: ["bug", "Triage Required"]
 
 body:
   - type: markdown
     attributes:
       value: |
-        This is the repository and issue tracker for the https://www.pyton.org website.
+        This is the repository and issue tracker for the https://www.python.org website.
 
         If you're looking to file an issue with CPython itself, please click here: [CPython Issues](https://github.com/python/cpython/issues/new/choose).
 

.github/ISSUE_TEMPLATE/DOCS.yml

@@ -7,7 +7,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        This is the repository and issue tracker for the https://www.pyton.org website.
+        This is the repository and issue tracker for the https://www.python.org website.
 
         If you're looking to file an issue with CPython itself, please click here: [CPython Issues](https://github.com/python/cpython/issues/new/choose).
 

.github/ISSUE_TEMPLATE/REQUEST.yml

@@ -1,13 +1,13 @@
 name: "Feature Request"
-description: Suggest an idea for www.pyton.org
+description: Suggest an idea for www.python.org
 title: "Enhancement: <title>"
 labels: ["enhancement"]
 
 body:
   - type: markdown
     attributes:
       value: |
-        This is the repository and issue tracker for the https://www.pyton.org website.
+        This is the repository and issue tracker for the https://www.python.org website.
 
         If you're looking to file an issue with CPython itself, please click here: [CPython Issues](https://github.com/python/cpython/issues/new/choose).
 

downloads/templatetags/download_tags.py

@@ -8,6 +8,11 @@ def strip_minor_version(version):
     return '.'.join(version.split('.')[:2])
 
 
+@register.filter
+def has_gpg(files: list) -> bool:
+    return any(f.gpg_signature_file for f in files)
+
+
 @register.filter
 def has_sigstore_materials(files):
     return any(

infra/cdn/main.tf

@@ -136,6 +136,12 @@ resource "fastly_service_vcl" "python_org" {
     statement = "req.http.host == \"python.org\""
     type      = "REQUEST"
   }
+  condition {
+    name      = "Always False"
+    priority  = 10
+    statement = "false"
+    type      = "RESPONSE"
+  }
 
   condition {
     name      = "Don't cache 404s for /static"
@@ -262,9 +268,10 @@ resource "fastly_service_vcl" "python_org" {
   }
 
   logging_datadog {
-    name   = "ratelimit-debug"
-    token  = var.datadog_key
-    region = "US"
+    name               = "ratelimit-debug"
+    token              = var.datadog_key
+    region             = "US"
+    response_condition = "Always False"
   }
 
   logging_s3 {
@@ -361,7 +368,7 @@ resource "fastly_service_vcl" "python_org" {
   dynamic "dictionary" {
     for_each = var.activate_ngwaf_service ? [1] : []
     content {
-      name = var.edge_security_dictionary
+      name          = var.edge_security_dictionary
       force_destroy = true
     }
   }

templates/downloads/release_detail.html

@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load boxes %}
 {% load sitetree %}
+{% load has_gpg from download_tags %}
 {% load has_sigstore_materials from download_tags %}
 {% load has_sbom from download_tags %}
 {% load sort_windows from download_tags %}
@@ -51,7 +52,9 @@ <h1 class="page-title">Files</h1>
               <th>Description</th>
               <th>MD5 Sum</th>
               <th>File Size</th>
+              {% if release_files|has_gpg %}
               <th>GPG</th>
+              {% endif %}
               {% if release_files|has_sigstore_materials %}
               <th colspan="2"><a href="https://www.python.org/download/sigstore/">Sigstore</a></th>
               {% endif %}
@@ -68,7 +71,9 @@ <h1 class="page-title">Files</h1>
                 <td>{{ f.description }}</td>
                 <td>{{ f.md5_sum }}</td>
                 <td>{{ f.filesize|filesizeformat }}</td>
+                {% 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_sigstore_materials %}
                   {% if f.sigstore_bundle_file %}
                   <td colspan="2">{% if f.sigstore_bundle_file %}<a href="{{ f.sigstore_bundle_file}}">.sigstore</a>{% endif %}</td>

templates/sponsors/admin/contracts/sponsorship-agreement.md

@@ -33,9 +33,9 @@ and international community of Python programmers (the **"Programs"**);
 and the PSF previously entered into a Sponsorship Agreement
 with the effective date of the
 {{ previous_effective|date:"j" }}{{ previous_effective_english_suffix }} of {{ previous_effective|date:"F Y" }}
-
-**WHEREAS**, Sponsor wishes to renew its support the Programs by making a contribution to the PSF.
 and a term of one year (the “Sponsorship Agreement”).
+
+**WHEREAS**, Sponsor wishes to renew its support of the Programs by making a contribution to the PSF.
 {% else %}
 wishes to support the Programs by making a contribution to the PSF.
 {% endif %}