Merge branch 'main' into clarify-dev-cycle

Author: AA-Turner

.github/CONTRIBUTING.md

@@ -18,13 +18,12 @@ Please be aware that our workflow does deviate slightly from the typical GitHub
 project. Details on how to properly submit a pull request are covered in
 [Lifecycle of a Pull Request](https://devguide.python.org/pullrequest/).
 We utilize various bots and status checks to help with this, so do follow the
-comments they leave and their "Details" links, respectively. The key points of
-our workflow that are not covered by a bot or status check are:
+comments they leave and their "Details" links, respectively.
 
-- All discussions that are not directly related to the code in the pull request
-  should happen on the [issue tracker](https://devguide.python.org/tracker/)
-- Upon your first non-trivial pull request (which includes documentation changes),
-  feel free to add yourself to [`Misc/ACKS`](https://github.com/python/cpython/blob/main/Misc/ACKS)
+The final key part of our workflow is that all discussions that are not
+directly related to the code in the pull request should happen on the
+[issue tracker](https://devguide.python.org/tracker/), generally in the
+pull request's parent issue.
 
 
 ## Setting Expectations

.github/dependabot.yml

@@ -1,7 +1,23 @@
 version: 2
 updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: monthly
+  assignees:
+    - "ezio-melotti"
+  groups:
+    actions:
+      patterns:
+        - "*"
+
 - package-ecosystem: pip
   directory: "/"
   schedule:
     interval: monthly
-  open-pull-requests-limit: 10
+  assignees:
+    - "ezio-melotti"
+  groups:
+    pip:
+      patterns:
+        - "*"

.github/workflows/ci.yml

@@ -12,8 +12,8 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
           python-version: "3"
       - name: Install uv

.github/workflows/lint.yml

@@ -8,8 +8,8 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.x"
-      - uses: pre-commit/[email protected].0
+      - uses: pre-commit/[email protected].1

_static/python-cyclic-gc-1-new-page.png

@@ -149,10 +149,14 @@
     "pullrequest.rst": "getting-started/pull-request-lifecycle.rst",
     "setup.rst": "getting-started/setup-building.rst",
     # CPython Internals
-    "compiler.rst": "internals/compiler.rst",
-    "exploring.rst": "internals/exploring.rst",
-    "garbage_collector.rst": "internals/garbage-collector.rst",
-    "parser.rst": "internals/parser.rst",
+    "compiler.rst": "internals.rst",
+    "exploring.rst": "internals.rst",
+    "garbage_collector.rst": "internals.rst",
+    "parser.rst": "internals.rst",
+    "internals/compiler.rst": "internals.rst",
+    "internals/exploring.rst": "internals.rst",
+    "internals/garbage_collector.rst": "internals.rst",
+    "internals/parser.rst": "internals.rst",
     # Testing and Buildbots
     "buildbots.rst": "testing/buildbots.rst",
     "coverage.rst": "testing/coverage.rst",