Merge branch 'main' into update-ai-contrib-guide

Author: Mariatta

_static/psrt-coordinator-report.html

@@ -0,0 +1,31 @@
+<!-- Centering a div -->
+<div style="width: 100%; text-align: center;">
+<div style="display: inline-block; text-align: left;">
+<code><pre>
+          ┌────────────────────────┐
+          │  Received a report...  │
+          └──┬──────────────────┬──┘
+             │                  │
+┌────────────▼──────────────┐ ┌─▼──────────┐
+│ ..via security@python.org │ │ ..via GHSA │
+└────────────┬──────────────┘ └─┬──────────┘
+             │                  │
+┌────────────▼──────────────┐   │
+│  PSRT admin reviews email │   │
+└───┬───────────────────┬───┘   │
+    │                   │       │
+┌───▼────┐         ┌────▼───┐   │
+│ Reject │         │ Accept │   │
+└────────┘         └────┬───┘   │
+                        │       │
+┌───────────────────────▼───┐   │
+│   PSRT asks reporter to   │   │
+│       open via GHSA       │   │
+└────────────┬──────────────┘   │
+             │                  │
+          ┌──▼──────────────────▼──┐
+          │ GHSA in state 'Triage' │
+          └────────────────────────┘
+</pre></code>
+</div>
+</div>

_static/psrt-coordinator-triage.html

@@ -0,0 +1,40 @@
+<!-- Centering a div -->
+<div style="width: 100%; text-align: center;">
+<div style="display: inline-block; text-align: left;">
+<code><pre>
+                 ┌────────────────────────┐
+                 │ GHSA in state 'Triage' │
+                 └─┬────────────────────┬─┘
+                   │                    │
+┌──────────────────▼─────────┐ ┌────────▼───────────────────┐
+│                            │ │   After 3 days idle,       │
+│    PSRT member volunteers  │ │   Coordinator is assigned  │
+│    as Coordinator          │ │   automatically by bot     │
+└──────────────────┬─────────┘ └────────┬───────────────────┘
+                   │                    │
+                 ┌─▼────────────────────▼─┐
+                 │  GHSA update 'Credit'  │
+                 │  field to Coordinator  │
+                 └────────────┬───────────┘
+                              │
+                 ┌────────────▼───────────┐
+                 │ Coordinator determines │
+             ┌───┤    whether report...   ┼───┐
+             │   └────────────┬───────────┘   │
+             │                │               │
+┌────────────▼─┐ ┌────────────▼───────────┐ ┌─▼─────────────┐
+│..is a invalid│ │  ..is a bug, but not   │ │..is a security│
+│  or non-issue│ │    security relevant   │ │     issue     │
+└────────────┬─┘ └────────────┬───────────┘ └─┬─────────────┘
+             │                │               │
+             │   ┌────────────▼───────────┐   │
+             │   │   Coordinator opens a  │   │
+             │   │   public GitHub issue  │   │
+             │   └─┬──────────────────────┘   │
+             │     │                          │
+  ┌──────────▼─────▼───────┐     ┌────────────▼───────────┐
+  │ Close the GHSA ticket  │     │  GHSA in state 'Draft' │
+  └────────────────────────┘     └────────────────────────┘
+</pre></code>
+</div>
+</div>

core-team/core-team.csv

@@ -1,3 +1,4 @@
+Chris Eibl,chris-eibl,2026-05-10,,
 Stan Ulbrych,StanFromIreland,2026-03-26,,
 Itamar Oren,itamaro,2026-02-16,,
 Emma Smith,emmatyping,2025-07-31,,

developer-workflow/communication-channels.rst

@@ -22,6 +22,38 @@ in return.
 .. _Diversity Statement: https://www.python.org/psf/diversity/
 
 
+.. _multicultural-communication:
+
+Communicating across cultures and languages
+===========================================
+
+Not every contributor writes English as a first language, and phrasing that
+feels neutral in one culture can read as blunt or rude in another.
+
+**Practice active listening.** Try to focus on understanding the message before reacting.
+
+**Confirm understanding.** Ask open-ended questions and paraphrase to avoid
+misunderstandings. If you're unsure what someone meant, ask: "I want to make
+sure I understand: are you saying X?"
+
+**Use translation tools freely.** If English isn't your first language,
+translation software or AI tools may help you check that your message has the
+tone you intend. Getting the phrasing wrong can make a reasonable point sound
+more aggressive than it is.
+
+**Watch out for rhetorical questions.** They read as hostile in text even when
+that's not the intent at all:
+
+* Instead of "Why do you think it is wrong?!", try "That doesn't sound right
+  to me. Here's why: …"
+* Instead of "Did you even read the docs?", try "The relevant documentation
+  is at …"
+
+**Be patient with newcomers.** If someone doesn't know how things work here,
+point them to the right docs or give them the context they need. Criticism
+without guidance isn't helpful.
+
+
 .. _mailinglists:
 
 Mailing lists

developer-workflow/psrt.csv

@@ -2,6 +2,7 @@ Adam Turner,AA-Turner,
 Barry Warsaw,warsaw,Admin
 Bénédikt Tran,picnixz,
 Benjamin Peterson,benjaminp,
+Damian Shaw,notatallshaw,
 Donald Stufft,dstufft,
 Dustin Ingram,di,
 Ee Durbin,ewdurbin,Admin
@@ -10,6 +11,7 @@ Glyph Lefkowitz,glyph,
 Gregory P. Smith,gpshead,
 Hugo van Kemenade,hugovk,Release Manager
 Jacob Coffee,JacobCoffee,
+Kirill Podoprigora,eclips4,
 Larry Hastings,larryhastings,
 Łukasz Langa,ambv,Release Manager
 Ned Deily,ned-deily,"Admin, Release Manager"