Merge branch 'main' into release

Author: ewdurbin

.github/dependabot.yml

@@ -19,3 +19,11 @@ updates:
   - dependency-name: lxml
     versions:
     - 4.6.2
+- package-ecosystem: github-actions
+  directory: "/"
+  groups:
+    github-actions:
+      patterns:
+        - "*"  # Group all Actions updates into a single larger pull request
+  schedule:
+    interval: daily

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Install platform dependencies
         run: |
           sudo apt -y update
@@ -29,11 +29,11 @@ jobs:
         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@v2
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.9.16
       - name: Cache Python dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: pythondotorg-cache-pip
         with:

README.md

@@ -1,6 +1,6 @@
 # python.org
 
-[![Build Status](https://travis-ci.org/python/pythondotorg.svg?branch=main)](https://travis-ci.org/python/pythondotorg)
+[![CI](https://github.com/python/pythondotorg/actions/workflows/ci.yml/badge.svg)](https://github.com/python/pythondotorg/actions/workflows/ci.yml)
 [![Documentation Status](https://readthedocs.org/projects/pythondotorg/badge/?version=latest)](https://pythondotorg.readthedocs.io/?badge=latest)
 
 ### General information

dev-requirements.txt

@@ -2,7 +2,7 @@
 
 # Required for running tests
 
-factory-boy==3.1.0
+factory-boy==3.2.1
 Faker==0.8.1
 tblib==1.7.0
 responses==0.13.3

docs/source/administration.rst

@@ -6,7 +6,7 @@ Administration
 Navigation
 ----------
 
-Navigation on the site is managed by the `Sitetree  <https://pypi.org/pypi/django-sitetree>`_ application.  The hierarchy should be fairly obvious.  The biggest gotcha is when defining the URLs.
+Navigation on the site is managed by the `Sitetree  <https://pypi.org/project/django-sitetree/>`_ application.  The hierarchy should be fairly obvious.  The biggest gotcha is when defining the URLs.
 
 Many URLs are defined using `Django's URL system <https://docs.djangoproject.com/en/dev/topics/http/urls/>`_ however many are also simply defined as relative paths.  When editing a particular item in the Sitetree in the *Additional Settings* fieldset there is an option named *URL as pattern*.  If this option is checked the URL pattern is checked against the URLs defined by the Django applications. If it is left unchecked relative and absolute URLs can be entered.
 

docs/source/contributing.rst

@@ -11,7 +11,7 @@ already submitted it.
 Code
 ----
 
-The source for python.org is open and licensed under the `Apache 2 license <license>`_.
+The source for python.org is open and licensed under the `Apache 2 license <license_>`_.
 To contribute to either the code or documentation please fork the pythondotorg_
 repository and submit a pull request.
 

docs/source/index.rst

@@ -12,9 +12,9 @@ General information
 :IRC: ``#pydotorg`` on Freenode
 :Staging site: https://staging.python.org/ (``main`` branch)
 :Production configuration: https://github.com/python/psf-salt
-:Travis:
-  .. image:: https://travis-ci.org/python/pythondotorg.svg?branch=main
-       :target: https://travis-ci.org/python/pythondotorg
+:GitHub Actions:
+  .. image:: https://github.com/python/pythondotorg/actions/workflows/ci.yml/badge.svg
+       :target: https://github.com/python/pythondotorg/actions/workflows/ci.yml
 :License: Apache License
 
 Contents:

docs/source/install.md

@@ -12,13 +12,13 @@ Docker Compose will be installed by [Docker Mac](https://docs.docker.com/desktop
 Getting started
 ---------------
 
-To get the Pythondotorg source code, [fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) the repository on [GitHub](https://github.com/python/pythondotorg) and [clone](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository) it to your local machine: 
+To get the Pythondotorg source code, [fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo) the repository on [GitHub](https://github.com/python/pythondotorg) and [clone](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository) it to your local machine: 
 
 ```
 git clone git@github.com:YOUR-USERNAME/pythondotorg.git
 ```
 
-Add a [remote](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-for-a-fork) and [sync](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) regularly to stay current with the repository. 
+Add a [remote](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-repository-for-a-fork) and [sync](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork) regularly to stay current with the repository. 
 
 ```
 git remote add upstream https://github.com/python/pythondotorg
@@ -33,7 +33,7 @@ Installing Docker
 Install [Docker Engine](https://docs.docker.com/engine/install/) 
 
 ```{note}
-The best experience for building Pythondotorg on Windows is to use the [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/)(WSL) in combination with both [Docker for Windows](https://docs.docker.com/desktop/install/windows-install/) and [Docker for Linux](https://docs.docker.com/engine/install/).
+The best experience for building Pythondotorg on Windows is to use the [Windows Subsystem for Linux](https://learn.microsoft.com/en-us/windows/wsl/)(WSL) in combination with both [Docker for Windows](https://docs.docker.com/desktop/install/windows-install/) and [Docker for Linux](https://docs.docker.com/engine/install/).
 ```
 
 Verify that the Docker installation is successful by running: `docker -v`
@@ -197,7 +197,7 @@ Once you have it installed, update the URL value of `HAYSTACK_CONNECTIONS` set
 Generating CSS files automatically
 ----------------------------------
 
-Due to performance issues of [django-pipeline](https://github.com/cyberdelia/django-pipeline/issues/313), we are using a dummy compiler `pydotorg.compilers.DummySASSCompiler` in development mode. To generate CSS files, use `sass` itself in a separate terminal window:
+Due to performance issues of [django-pipeline](https://github.com/jazzband/django-pipeline/issues/313), we are using a dummy compiler `pydotorg.compilers.DummySASSCompiler` in development mode. To generate CSS files, use `sass` itself in a separate terminal window:
 
 ```
 $ cd static

docs/source/pep_generation.rst

@@ -31,4 +31,4 @@ This process runs periodically via cron to keep the PEP pages up to date.
 
 See :ref:`management-commands` for all management commands.
 
-.. _PEP Repository: https://github.com/python/peps.git
+.. _PEP Repository: https://github.com/python/peps

prod-requirements.txt

@@ -1,4 +1,4 @@
-gunicorn==19.9.0
+gunicorn==21.2.0
 
 raven==6.10.0
 

templates/python/documentation.html

@@ -81,7 +81,7 @@ <h2 class="widget-title"><span aria-hidden="true" class="icon-versions"></span>P
                         <ul>
                           <li><a href="https://www.python.org/doc/sunset-python-2/">FAQ: Sunsetting Python 2</a></li>
                           <li><a href="https://www.python.org/dev/peps/pep-0373/">Final Python 2.7 Release Schedule</a></li>
-                          <li><a href="https://python3statement.org/">Python 3 Statement</a></li>
+                          <li><a href="https://python3statement.github.io/">Python 3 Statement</a></li>
                           <li>
                             <a href="https://docs.python.org/3/howto/pyporting.html">Porting Python 2 Code to Python 3</a>
                             <ul>