Merge branch 'main' into move-news

# Conflicts:
#	core-team/committing.rst

Author: StanFromIreland

.github/CODEOWNERS

@@ -4,5 +4,5 @@
 # It uses the same pattern rule for gitignore file
 # https://git-scm.com/docs/gitignore#_pattern_format
 
-
-garbage_collector.rst         @pablogsal
+# PSRT member list owned by PSRT admins.
+developer-workflow/psrt.csv   @warsaw @ewdurbin @ned-deily @sethmlarson

.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/documentation-links.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/action@v3.0.0
+      - uses: pre-commit/action@v3.0.1

.github/workflows/lint.yml

@@ -90,5 +90,5 @@ celerybeat-schedule
 # Generated CSV and SVG files
 include/branches.csv
 include/end-of-life.csv
-include/release-cycle.svg
-include/release-cycle-all.svg
+_static/release-cycle.svg
+_static/release-cycle-all.svg

.gitignore

@@ -7,14 +7,12 @@ repos:
         args: [--exit-non-zero-on-fix]
       - id: ruff-format
         name: Run Ruff (format)
-        args: [--check]
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
       - id: check-case-conflict
       - id: check-merge-conflict
-      - id: check-json
       - id: check-yaml
       - id: debug-statements
       - id: end-of-file-fixer

.pre-commit-config.yaml

@@ -22,8 +22,8 @@ REQUIREMENTS = requirements.txt
 _ALL_SPHINX_OPTS = --jobs $(JOBS) $(SPHINXOPTS)
 _RELEASE_CYCLE   = include/branches.csv \
                    include/end-of-life.csv \
-                   include/release-cycle-all.svg \
-                   include/release-cycle.svg
+                   _static/release-cycle-all.svg \
+                   _static/release-cycle.svg
 
 .PHONY: help
 help:
@@ -103,15 +103,20 @@ _ensure-pre-commit:
 lint: _ensure-pre-commit
 	$(VENVDIR)/bin/python3 -m pre_commit run --all-files
 
-# Defined so that "include/release-cycle.json"
-# doesn't fall through to the catch-all target.
-include/release-cycle.json:
-	@exit
-
-$(_RELEASE_CYCLE): include/release-cycle.json
+# Generate all release cycle files together with a single script invocation
+# Use branches.csv as the primary target, others depend on it
+include/branches.csv:
 	$(VENVDIR)/bin/python3 _tools/generate_release_cycle.py
 	@echo Release cycle data generated.
 
+# Other files are generated together with branches.csv
+include/end-of-life.csv: include/branches.csv
+	@:
+_static/release-cycle-all.svg: include/branches.csv
+	@:
+_static/release-cycle.svg: include/branches.csv
+	@:
+
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.
 .PHONY: Makefile

Makefile

@@ -6,102 +6,6 @@
     height: 110px;
 }
 
-/* Release cycle chart */
-
-.release-cycle-chart {
-    width: 100%;
-}
-
-.release-cycle-chart .release-cycle-year-line {
-    stroke: var(--color-foreground-primary);
-    stroke-width: 0.8px;
-    opacity: 75%;
-}
-
-.release-cycle-chart .release-cycle-year-text {
-    fill: var(--color-foreground-primary);
-}
-
-.release-cycle-chart .release-cycle-today-line {
-    stroke: var(--color-brand-primary);
-    stroke-width: 1.6px;
-}
-
-.release-cycle-chart .release-cycle-row-shade {
-    fill: var(--color-background-item);
-    opacity: 50%;
-}
-
-.release-cycle-chart .release-cycle-version-label {
-    fill: var(--color-foreground-primary);
-}
-
-.release-cycle-chart .release-cycle-blob {
-    stroke-width: 1.6px;
-    /* default colours, overridden below for individual statuses */
-    fill: var(--color-background-primary);
-    stroke: var(--color-foreground-primary);
-}
-
-.release-cycle-chart .release-cycle-blob-label {
-    /* white looks good on both light & dark */
-    fill: white;
-}
-
-.release-cycle-chart .release-cycle-blob-label.release-cycle-status-security,
-.release-cycle-chart .release-cycle-blob-label.release-cycle-status-bugfix {
-    /* but use black to improve contrast for lighter backgrounds */
-    fill: black;
-}
-
-.release-cycle-chart .release-cycle-blob-label.release-cycle-status-end-of-life,
-.release-cycle-chart .release-cycle-blob-label.release-cycle-status-prerelease,
-.release-cycle-chart .release-cycle-blob-label.release-cycle-status-feature {
-    /* and FG when it's not in a blob */
-    fill: var(--color-foreground-primary);
-}
-
-.release-cycle-chart .release-cycle-status-end-of-life {
-    --status-bg-color: #DD2200;
-    --status-border-color: #FF8888;
-}
-
-.release-cycle-chart .release-cycle-status-security {
-    --status-bg-color: #FFDD44;
-    --status-border-color: #FF8800;
-}
-
-.release-cycle-chart .release-cycle-status-bugfix {
-    --status-bg-color: #00DD22;
-    --status-border-color: #008844;
-}
-
-.release-cycle-chart .release-cycle-status-prerelease {
-    --status-bg-color: teal;
-    --status-border-color: darkgreen;
-}
-
-.release-cycle-chart .release-cycle-status-feature {
-    --status-bg-color: #2222EE;
-    --status-border-color: #008888;
-}
-
-.release-cycle-chart .release-cycle-blob {
-    fill: var(--status-bg-color);
-    stroke: transparent;
-}
-
-.release-cycle-chart .release-cycle-blob-full {
-    fill: var(--status-bg-color);
-    stroke: var(--status-border-color);
-}
-
-.release-cycle-chart .release-cycle-border {
-    fill: transparent;
-    stroke: var(--status-border-color);
-    stroke-width: 1.6px;
-}
-
 .good pre {
   border-left: 3px solid rgba(74, 182, 93, 1);
 }