Merge branch 'main' into pr-combinator-option2

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/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Install platform dependencies
         run: |
           sudo apt -y update
@@ -31,7 +31,7 @@ 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@v5
+      - uses: actions/setup-python@v6
         with:
             python-version-file: '.python-version'
       - name: Cache Python dependencies

.github/workflows/deployminder.yml

@@ -7,8 +7,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+        uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
             python-version-file: '.python-version'
       - name: Cache Python dependencies

.github/workflows/static.yml

@@ -4,10 +4,10 @@ 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.18
+Django==4.2.26
 docutils==0.21.2
 Markdown==3.7
-cmarkgfm==0.6.0
+cmarkgfm==2024.11.20
 Pillow==10.4.0
 psycopg2-binary==2.9.9
 python3-openid==3.2.0

base-requirements.txt

@@ -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/commands.rst

@@ -25,15 +25,12 @@ Contents:
    install.md
    contributing
    administration
-   pep_generation
    commands
 
 Indices and tables
 ==================
 
 * :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
 
 .. _python.org: https://www.python.org
 .. _pydotorg-www: https://mail.python.org/mailman/listinfo/pydotorg-www

docs/source/index.rst

@@ -25,3 +25,9 @@ class ReleaseAdmin(ContentManageableModelAdmin):
     list_filter = ['version', 'is_published', 'show_on_download_page']
     search_fields = ['name', 'slug']
     ordering = ['-release_date']
+
+    def formfield_for_dbfield(self, db_field, request, **kwargs):
+        field = super().formfield_for_dbfield(db_field, request, **kwargs)
+        if db_field.name == "name":
+            field.widget.attrs["placeholder"] = "Python 3.X.YaN"
+        return field

docs/source/pep_generation.rst

@@ -23,11 +23,20 @@ def python2(self):
     def python3(self):
         return self.filter(version=3, is_published=True)
 
+    def pymanager(self):
+        return self.filter(version=100, is_published=True)
+
     def latest_python2(self):
         return self.python2().filter(is_latest=True)
 
-    def latest_python3(self):
-        return self.python3().filter(is_latest=True)
+    def latest_python3(self, minor_version: int | None = None):
+        if minor_version is None:
+            return self.python3().filter(is_latest=True)
+        pattern = rf"^Python 3\.{minor_version}\."
+        return self.python3().filter(name__regex=pattern).order_by("-release_date")
+
+    def latest_pymanager(self):
+        return self.pymanager().filter(is_latest=True)
 
     def pre_release(self):
         return self.filter(pre_release=True)
@@ -38,15 +47,10 @@ def released(self):
 
 class ReleaseManager(Manager.from_queryset(ReleaseQuerySet)):
     def latest_python2(self):
-        qs = self.get_queryset().latest_python2()
-        if qs:
-            return qs[0]
-        else:
-            return None
-
-    def latest_python3(self):
-        qs = self.get_queryset().latest_python3()
-        if qs:
-            return qs[0]
-        else:
-            return None
+        return self.get_queryset().latest_python2().first()
+
+    def latest_python3(self, minor_version: int | None = None):
+        return self.get_queryset().latest_python3(minor_version).first()
+
+    def latest_pymanager(self):
+        return self.get_queryset().latest_pymanager().first()