Merge branch 'main' into sentry-6931306293

Author: JacobCoffee

.gitattributes

@@ -1,4 +1,3 @@
 static/sass/*.css linguist-vendored
-peps/tests/fake_pep_repo/*.html linguist-vendored
 static/js/libs/*.js linguist-vendored
 static/js/plugins/*.js linguist-vendored

.github/CODEOWNERS

@@ -1,2 +1,2 @@
 # Notify @EWDurbin for all opened Issues and Pull Requests
-*	@EWDurbin @JacobCoffee
+* @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 || github.ref == 'refs/heads/main'
+    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 || github.ref == 'refs/heads/main'
     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@v5
+      - 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
-        uses: actions/cache@v4
-        env:
-          cache-name: pythondotorg-cache-pip
+          python-version-file: '.python-version'
+
+      - name: Cache pip
+        uses: actions/cache@v5
         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
+
+      - name: Run tests
+        run: python -Wd -m coverage run manage.py test -v2
         env:
           DATABASE_URL: postgres://postgres:postgres@localhost:5432/pythonorg
-      - 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/lint.yml

@@ -0,0 +1,24 @@
+name: Lint
+
+on: [push, pull_request, workflow_dispatch]
+
+permissions: {}
+
+env:
+  FORCE_COLOR: 1
+  RUFF_OUTPUT_FORMAT: github
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.x"
+
+      - uses: j178/prek-action@v1

.github/workflows/static.yml

@@ -1,18 +1,20 @@
 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 || github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
+
       - uses: actions/setup-python@v6
         with:
             python-version-file: '.python-version'
       - name: Cache Python dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         env:
           cache-name: pythondotorg-cache-pip
         with:

.pre-commit-config.yaml

@@ -0,0 +1,34 @@
+repos:
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: 1.29.1
+    hooks:
+      - id: django-upgrade
+        args: [--target-version=4.2]
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
+    hooks:
+      - id: check-case-conflict
+      - id: check-merge-conflict
+      - id: check-json
+      - id: check-yaml
+      - id: debug-statements
+
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.34.0
+    hooks:
+      - id: check-dependabot
+      - id: check-github-workflows
+
+  - repo: https://github.com/rhysd/actionlint
+    rev: v1.7.7
+    hooks:
+      - id: actionlint
+
+  - repo: meta
+    hooks:
+      - id: check-hooks-apply
+      - id: check-useless-excludes
+
+ci:
+  autoupdate_schedule: quarterly

base-requirements.txt

@@ -4,7 +4,7 @@ django-sitetree==1.18.0  # >=1.17.1 is (?) first version that supports Django 4.
 django-apptemplates==1.5
 django-admin-interface==0.28.9
 django-translation-aliases==0.1.0
-Django==4.2.25
+Django==4.2.28
 docutils==0.21.2
 Markdown==3.7
 cmarkgfm==2024.11.20
@@ -23,30 +23,30 @@ celery[redis]==5.4.0
 django-celery-beat==2.5.0
 # TODO: We may drop 'django-imagekit' completely.
 django-imagekit==5.0  # 5.0 is first version that supports Django 4.2
-django-haystack==3.2.1
+django-haystack==3.3.0
 elasticsearch>=7,<8
 # TODO: 0.14.0 only supports Django 1.8 and 1.11.
 django-tastypie==0.14.7  # 0.14.6 is first version that supports Django 4.2
 
 pytz==2021.1
 python-dateutil==2.8.2
 
-requests[security]>=2.26.0
+requests>=2.26.0
 
 django-honeypot==1.0.4  # 1.0.4 is first version that supports Django 4.2
 django-markupfield==2.0.1
 
-django-allauth==64.2.1
+django-allauth==65.13.0
 
 django-waffle==2.2.1
 
 djangorestframework==3.14.0  # 3.14.0 is first version that supports Django 4.1, 4.2 support hasnt been "released"
 django-filter==2.4.0
 django-ordered-model==3.7.4
 django-widget-tweaks==1.5.0
-django-countries==7.2.1
+django-countries==8.2.0
 num2words==0.5.13
-django-polymorphic==3.1.0  # 3.1.0 is first version that supports Django 4.0, unsure if it fully supports 4.2
+django-polymorphic==4.1.0
 sorl-thumbnail==12.11.0
 django-extensions==3.2.3
 django-import-export==2.7.1

docs/source/commands.rst

@@ -35,30 +35,3 @@ Command-line options
 .. option:: --app-label <app_label>
 
    Create initial data with the *app_label* provided.
-
-.. _command-generate-pep-pages:
-
-generate_pep_pages
-------------------
-
-This command generates ``pages.Page`` objects from the output
-of the existing PEP repository generation process. You run it like::
-
-    $ ./manage.py generate_pep_pages
-
-To get verbose output, specify ``--verbosity`` option::
-
-    $ ./manage.py generate_pep_pages --verbosity=2
-
-It uses the conversion code in the ``peps/converters.py`` file, in an
-attempt to normalize the formatting for display purposes.
-
-.. _command-dump-pep-pages:
-
-dump_pep_pages
---------------
-
-This command simply dumps our PEP related pages as JSON to :attr:`sys.stdout`.
-You can run like::
-
-    $ ./manage.py dump_pep_pages

docs/source/index.rst

@@ -25,7 +25,6 @@ Contents:
    install.md
    contributing
    administration
-   pep_generation
    commands
 
 Indices and tables