Merge branch 'main' into django-5.2

Author: JacobCoffee

.github/workflows/ci.yml

@@ -1,9 +1,46 @@
 name: CI
-on: [push, pull_request]
+
+on: [push, pull_request, workflow_dispatch]
+
 jobs:
+  migrations:
+    if: github.event_name != 'push' || github.event.repository.fork == true
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:15.3
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: pythonorg
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: actions/setup-python@v6
+        with:
+          python-version-file: '.python-version'
+
+      - name: Cache pip
+        uses: actions/cache@v5
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('*-requirements.txt') }}
+          restore-keys: ${{ runner.os }}-pip-
+
+      - name: Install dependencies
+        run: pip install -r dev-requirements.txt
+
+      - name: Check for ungenerated migrations
+        run: python manage.py makemigrations --check --dry-run
+        env:
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432/pythonorg
+
   test:
-    # Avoid running CI more than once on pushes to main repo open PRs
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    if: github.event_name != 'push' || github.event.repository.fork == true
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -13,52 +50,46 @@ jobs:
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: pythonorg
         ports:
-        - 5432:5432
-        # needed because the postgres container does not provide a healthcheck
+          - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
     steps:
-      - name: Check out repository
-        uses: actions/checkout@v6
+      - uses: actions/checkout@v6
+
       - name: Install platform dependencies
         run: |
           sudo apt -y update
           sudo apt -y install --no-install-recommends \
-              texlive-latex-base \
-              texlive-latex-recommended \
-              texlive-plain-generic \
-              lmodern
+            texlive-latex-base \
+            texlive-latex-recommended \
+            texlive-plain-generic \
+            lmodern
+
       - name: Install pandoc
         run: |
           wget https://github.com/jgm/pandoc/releases/download/2.17.1.1/pandoc-2.17.1.1-1-amd64.deb
           sudo dpkg -i pandoc-2.17.1.1-1-amd64.deb
+
       - uses: actions/setup-python@v6
         with:
-            python-version-file: '.python-version'
-      - name: Cache Python dependencies
+          python-version-file: '.python-version'
+
+      - name: Cache pip
         uses: actions/cache@v5
-        env:
-          cache-name: pythondotorg-cache-pip
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('requirements.txt', '*-requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-
-            ${{ runner.os }}-${{ github.job }}-
-            ${{ runner.os }}-
-      - name: Install Python dependencies
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt', '*-requirements.txt') }}
+          restore-keys: ${{ runner.os }}-pip-
+
+      - name: Install dependencies
         run: |
           pip install -U pip setuptools wheel
           pip install -r dev-requirements.txt
-      - name: Check for ungenerated database migrations
-        run: |
-          python manage.py makemigrations --check --dry-run
-        env:
-          DATABASE_URL: postgres://postgres:postgres@localhost:5432/pythonorg
-      - name: Run Tests
-        run: |
-          python -Wd -m coverage run manage.py test -v2
+
+      - name: Run tests
+        run: python -Wd -m coverage run manage.py test -v2
         env:
           DATABASE_URL: postgres://postgres:postgres@localhost:5432/pythonorg
-      - name: Coverage
-        run: |
-          coverage report -m --fail-under=75
+
+      - name: Check coverage
+        run: coverage report -m --fail-under=75

.github/workflows/static.yml

@@ -1,13 +1,15 @@
 name: Check collectstatic
-on: [push, pull_request]
+
+on: [push, pull_request, workflow_dispatch]
+
 jobs:
   collectstatic:
-    # Avoid running CI more than once on pushes to main repo open PRs
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    if: github.event_name != 'push' || github.event.repository.fork == true
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
         uses: actions/checkout@v6
+
       - uses: actions/setup-python@v6
         with:
             python-version-file: '.python-version'

base-requirements.txt

@@ -36,7 +36,7 @@ requests>=2.26.0
 django-honeypot>=1.3.0
 django-markupfield==2.0.1
 
-django-allauth==64.2.1
+django-allauth==65.13.0
 
 django-waffle==2.2.1
 

downloads/templatetags/download_tags.py

@@ -4,30 +4,16 @@
 import requests
 from django import template
 from django.core.cache import cache
+from django.utils.html import format_html
+
+from downloads.models import Release
 
 register = template.Library()
 logger = logging.getLogger(__name__)
 
-PYTHON_RELEASES_URL = "https://peps.python.org/api/python-releases.json"
-PYTHON_RELEASES_CACHE_KEY = "python_python_releases"
-PYTHON_RELEASES_CACHE_TIMEOUT = 3600  # 1 hour
-
-
-def get_python_releases_data() -> dict | None:
-    """Fetch and cache the Python release cycle data from PEPs API."""
-    data = cache.get(PYTHON_RELEASES_CACHE_KEY)
-    if data is not None:
-        return data
-
-    try:
-        response = requests.get(PYTHON_RELEASES_URL, timeout=5)
-        response.raise_for_status()
-        data = response.json()
-        cache.set(PYTHON_RELEASES_CACHE_KEY, data, PYTHON_RELEASES_CACHE_TIMEOUT)
-        return data
-    except (requests.RequestException, ValueError) as e:
-        logger.warning("Failed to fetch release cycle data: %s", e)
-        return None
+RELEASE_CYCLE_URL = "https://peps.python.org/api/release-cycle.json"
+RELEASE_CYCLE_CACHE_KEY = "python_release_cycle"
+RELEASE_CYCLE_CACHE_TIMEOUT = 3600  # 1 hour
 
 
 @register.simple_tag
@@ -52,14 +38,12 @@ def get_eol_info(release) -> dict:
     major = int(match.group(1))
     minor_version = f"{match.group(1)}.{match.group(2)}"
 
-    python_releases = get_python_releases_data()
-    if python_releases is None:
+    release_cycle = get_release_cycle_data()
+    if release_cycle is None:
         # Can't determine EOL status, don't show warning
         return result
 
-    metadata = python_releases.get("metadata", {})
-    version_info = metadata.get(minor_version)
-
+    version_info = release_cycle.get(minor_version)
     if version_info is None:
         # Python 2 releases not in the list are EOL
         if major <= 2:
@@ -128,3 +112,73 @@ def sort_windows(files):
             other_files.append(file)
 
     return other_files + windows_files
+
+
+def get_release_cycle_data() -> dict | None:
+    """Fetch and cache the release cycle data from PEPs API."""
+    data = cache.get(RELEASE_CYCLE_CACHE_KEY)
+    if data is not None:
+        return data
+
+    try:
+        response = requests.get(RELEASE_CYCLE_URL, timeout=5)
+        response.raise_for_status()
+        data = response.json()
+        cache.set(RELEASE_CYCLE_CACHE_KEY, data, RELEASE_CYCLE_CACHE_TIMEOUT)
+        return data
+    except (requests.RequestException, ValueError) as e:
+        logger.warning("Failed to fetch release cycle data: %s", e)
+        return None
+
+
+@register.inclusion_tag("downloads/active-releases.html")
+def render_active_releases():
+    """Render the active Python releases table from PEPs API data."""
+    releases = []
+    release_cycle = get_release_cycle_data()
+
+    if release_cycle:
+        # Sort releases in descending order (newest first)
+        sorted_releases = sorted(
+            release_cycle.keys(),
+            key=lambda v: [int(x) for x in v.split(".")],
+            reverse=True,
+        )
+
+        found_eol = False
+        for release in sorted_releases:
+            info = release_cycle[release]
+            status = info.get("status", "")
+            first_release = info.get("first_release", "")
+
+            if status == "feature" and first_release:
+                first_release = f"{first_release} (planned)"
+
+            if status == "feature":
+                status = "pre-release"
+
+            if status == "end-of-life":
+                # Include only the most recent EOL release
+                if found_eol:
+                    continue
+                found_eol = True
+
+                # Get last release for EOL versions
+                minor = int(release.split(".")[1])
+                last_release = Release.objects.latest_python3(minor)
+                if last_release:
+                    status = format_html(
+                        'end-of-life, last release was <a href="{}">{}</a>',
+                        last_release.get_absolute_url(),
+                        last_release.get_version(),
+                    )
+
+            releases.append({
+                "version": release,
+                "status": status,
+                "first_release": first_release,
+                "end_of_life": info.get("end_of_life", ""),
+                "pep": info.get("pep"),
+            })
+
+    return {"releases": releases}