Merge branch 'main' into br-pt-name

Author: hugovk

.github/CONTRIBUTING.md

@@ -33,8 +33,8 @@ Due to the fact that this project is entirely volunteer-run (that is, no one is
 to work on Python full-time), we unfortunately can make no guarantees as to if
 or when a core developer will get around to reviewing your pull request.
 If no core developer has done a review or responded to changes made because of a
-"changes requested" review, please feel free to email [python-dev](https://mail.python.org/mailman3/lists/python-dev.python.org/) to ask if
-someone could take a look at your pull request.
+"changes requested" review, please consider seeking assistance through the
+[Core Development Discourse category](https://discuss.python.org/c/core-dev/23).
 
 
 ## Code of Conduct

Makefile

@@ -59,7 +59,7 @@ ensure-venv:
 	@if [ ! -d $(VENVDIR) ] ; then \
 		echo "Creating venv in $(VENVDIR)"; \
 		if $(UV) --version >/dev/null 2>&1; then \
-			$(UV) venv $(VENVDIR); \
+			$(UV) venv --python=$(PYTHON) $(VENVDIR); \
 			VIRTUAL_ENV=$(VENVDIR) $(UV) pip install -r $(REQUIREMENTS); \
 		else \
 			$(PYTHON) -m venv $(VENVDIR); \

core-developers/become-core-developer.rst

@@ -60,6 +60,14 @@ are granted through these steps:
      were in the form of a separate post on the already open topic with
      the poll.
 
+Getting a python.org email address
+----------------------------------
+
+Members of the core team can get an email address on the python.org domain.
+For more details refer to the `python.org email policy
+<https://www.python.org/psf/records/board/policies/email/>`_.
+
+
 Poll template
 =============
 

core-developers/developers.csv

@@ -31,7 +31,7 @@ Kyle Stanley,aeros,2020-04-14,,
 Donghee Na,corona10,2020-04-08,,
 Karthikeyan Singaravelan,tirkarthi,2019-12-31,,
 Joannah Nanjekye,nanjekyejoannah,2019-09-23,,
-Abhilash Raj,maxking,2019-08-06,,
+Abhilash Raj,maxking,2019-08-06,2022-11-30,"Privileges relinquished on 2022-11-30"
 Paul Ganssle,pganssle,2019-06-15,,
 Stéphane Wirtel,matrixise,2019-04-08,,
 Stefan Behnel,scoder,2019-04-08,,
@@ -52,7 +52,7 @@ Xavier de Gaye,xdegaye,2016-06-03,2018-01-25,Privileges relinquished on 2018-01-
 Davin Potts,applio,2016-03-06,,
 Martin Panter,vadmium,2015-08-10,2020-11-26,
 Paul Moore,pfmoore,2015-03-15,,
-Robert Collins,rbtcollins,2014-10-16,,To work on unittest
+Robert Collins,rbtcollins,2014-10-16,2021-11-30,To work on unittest; privileges relinquished on 2021-11-30
 Berker Peksağ,berkerpeksag,2014-06-26,,
 Steve Dower,zooba,2014-05-10,,
 Kushal Das,kushaldas,2014-04-14,,
@@ -69,7 +69,7 @@ Hynek Schlawack,hynek,2012-05-14,,
 Richard Oudkerk,,2012-04-29,2017-02-10,For multiprocessing module; did not make GitHub transition
 Andrew Svetlov,asvetlov,2012-03-13,,At PyCon sprint
 Petri Lehtinen,akheron,2011-10-22,2020-11-12,
-Meador Inge,meadori,2011-09-19,2020-11-26,
+Meador Inge,meadori,2011-09-19,,
 Jeremy Kloth,jkloth,2011-09-12,,
 Sandro Tosi,sandrotosi,2011-08-01,,
 Alex Gaynor,alex,2011-07-18,,For PyPy compatibility (since expanded scope)
@@ -78,7 +78,7 @@ Nadeem Vawda,,2011-04-10,2017-02-10,Did not make GitHub transition
 Carl Friedrich Bolz-Tereick,cfbolz,2011-03-21,,for stdlib compatibility work for PyPy
 Jason R. Coombs,jaraco,2011-03-14,,For sprinting on distutils2
 Ross Lagerwall,,2011-03-13,2017-02-10,Did not make GitHub transition
-Eli Bendersky,eliben,2011-01-11,2020-11-26,
+Eli Bendersky,eliben,2011-01-11,2020-11-26,Relinquished privileges on 2020-11-26
 Ned Deily,ned-deily,2011-01-09,,
 David Malcolm,davidmalcolm,2010-10-27,2020-11-12,relinquished privileges on 2020-11-12
 Tal Einat,taleinat,2010-10-04,,Initially for IDLE
@@ -100,12 +100,12 @@ Doug Hellmann,dhellmann,2009-09-20,2020-11-11,For documentation; relinquished pr
 Frank Wierzbicki,,2009-08-02,2017-02-10,For Jython compatibility; did not make GitHub transition
 Ezio Melotti,ezio-melotti,2009-06-07,,For documentation
 Philip Jenvey,pjenvey,2009-05-07,2020-11-26,For Jython compatibility
-Michael Foord,voidspace,2009-04-01,,For IronPython compatibility
+Michael Foord,voidspace,2009-04-01,2025-01-24,For IronPython compatibility; deceased
 R\. David Murray,bitdancer,2009-03-30,,
 Chris Withers,cjw296,2009-03-08,,
 Tarek Ziadé,tarekziade,2008-12-21,2017-02-10,For distutils module
 Hirokazu Yamamoto,,2008-08-12,2017-02-10,For Windows build; did not make GitHub transition
-Armin Ronacher,mitsuhiko,2008-07-23,2020-11-26,For documentation toolset and ast module
+Armin Ronacher,mitsuhiko,2008-07-23,,For documentation toolset and ast module
 Antoine Pitrou,pitrou,2008-07-16,,
 Senthil Kumaran,orsenthil,2008-06-16,,
 Jesse Noller,,2008-06-16,2017-02-10,For multiprocessing module; did not make GitHub transition
@@ -114,9 +114,9 @@ Guilherme Polo,,2008-04-24,2017-02-10,Did not make GitHub transition
 Jeroen Ruigrok van der Werven,,2008-04-12,2017-02-10,For documentation; did not make GitHub transition
 Benjamin Peterson,benjaminp,2008-03-25,,For bug triage
 David Wolever,wolever,2008-03-17,2020-11-21,For 2to3 module
-Trent Nelson,tpn,2008-03-17,2020-11-26,
+Trent Nelson,tpn,2008-03-17,,
 Mark Dickinson,mdickinson,2008-01-06,2024-08-13,For maths-related work
-Amaury Forgeot d'Arc,amauryfa,2007-11-09,2020-11-26,
+Amaury Forgeot d'Arc,amauryfa,2007-11-09,2020-11-26,"Relinquished privileges on 2020-11-26"
 Christian Heimes,tiran,2007-10-31,,
 Bill Janssen,,2007-08-28,2017-02-10,For ssl module; did not make GitHub transition
 Jeffrey Yasskin,,2007-08-09,2017-02-10,Did not make GitHub transition
@@ -142,9 +142,9 @@ Facundo Batista,facundobatista,2004-10-16,,
 Sean Reifschneider,,2004-09-17,2017-02-10,Did not make GitHub transition
 Johannes Gijsbers,,2004-08-14,2005-07-27,Privileges relinquished on 2005-07-27
 Matthias Klose,doko42,2004-08-04,,
-PJ Eby,pjeby,2004-03-24,2020-11-26,
+PJ Eby,pjeby,2004-03-24,2020-11-26,"Relinquished privileges on 2020-11-26"
 Vinay Sajip,vsajip,2004-02-20,,
-Hye-Shik Chang,hyeshik,2003-12-10,,
+Hye-Shik Chang,hyeshik,2003-12-10,2025-02-28,"Relinquished privileges on 2025-02-28"
 Armin Rigo,,2003-10-24,2012-06-01,Privileges relinquished in 2012
 Andrew McNamara,,2003-06-09,2017-02-10,Did not make GitHub transition
 Samuele Pedroni,,2003-05-16,2017-02-10,Did not make GitHub transition
@@ -157,7 +157,7 @@ Steve Holden,holdenweb,2002-06-14,2017-02-10,"Relinquished privileges on 2005-04
         but granted again for Need for Speed sprint; did not make GitHub transition"
 Christian Tismer,ctismer,2002-05-17,,For Need for Speed sprint
 Jason Tishler,,2002-05-15,2017-02-10,Did not make GitHub transition
-Walter Dörwald,doerwalter,2002-03-21,,
+Walter Dörwald,doerwalter,2002-03-21,2021-11-16,"Relinquished privileges on 2021-11-16"
 Andrew MacIntyre,,2002-02-17,2016-01-02,Privileges relinquished 2016-01-02
 Gregory P. Smith,gpshead,2002-01-08,,
 Anthony Baxter,,2001-12-21,2017-02-10,Did not make GitHub transition
@@ -190,7 +190,7 @@ Eric S. Raymond,,2000-06-02,2017-02-10,Did not make GitHub transition
 Greg Stein,,1999-11-07,2017-02-10,Did not make GitHub transition
 Just van Rossum,,1999-01-22,2017-02-10,Did not make GitHub transition
 Greg Ward,,1998-12-18,2017-02-10,Did not make GitHub transition
-Andrew Kuchling,akuchling,1998-04-09,,
+Andrew Kuchling,akuchling,1998-04-09,2022-11-09,Privileges relinquished 2022-11-09
 Ken Manheimer,,1998-03-03,2005-04-08,Privileges relinquished on 2005-04-08
 Jeremy Hylton,jeremyhylton,1997-08-13,,
 Roger E. Masse,,1996-12-09,2017-02-10,Did not make GitHub transition

core-developers/experts.rst

@@ -230,8 +230,8 @@ turtledemo            terryjreedy*
 types                 1st1
 typing                gvanrossum, JelleZijlstra*, AlexWaygood*, carljm, sobolevn*
 unicodedata           malemburg, ezio-melotti
-unittest              voidspace*, ezio-melotti, rbtcollins, gpshead
-unittest.mock         voidspace*
+unittest              ezio-melotti, rbtcollins, gpshead
+unittest.mock
 urllib                orsenthil
 uu
 uuid
@@ -298,7 +298,7 @@ Linux
 macOS                 ronaldoussoren, ned-deily, freakboy3742
 NetBSD1
 OS2/EMX               aimacintyre^
-Solaris/OpenIndiana   jcea
+Solaris/OpenIndiana   jcea, kulikjak
 Windows               tjguk, zware, zooba, pfmoore
 JVM/Java              frank.wierzbicki^
 ===================   ===========
@@ -358,7 +358,7 @@ runtime lifecycle   ericsnowcurrently, kumaraditya303, zooba
 str.format          ericvsmith*
 subinterpreters     ericsnowcurrently, kumaraditya303
 symbol table        JelleZijlstra, carljm
-testing             voidspace, ezio-melotti
+testing             ezio-melotti
 test coverage
 threads             gpshead
 time and dates      malemburg, abalkin, pganssle

core-developers/index.rst

@@ -13,3 +13,4 @@ Core developers
    developer-log
    motivations
    become-core-developer
+   memorialization

core-developers/memorialization.rst

@@ -0,0 +1,154 @@
+.. _memorialize-core-developer:
+
+===============
+Memorialization
+===============
+
+Rationale
+=========
+
+When a core developer passes away, memorializing accounts helps create
+a space for remembering the contributor and protects against attempted
+logins and fraudulent activity.
+
+The process
+===========
+
+The memorialization process is performed by a member of the PSF staff
+with administrative access to current and historical systems where
+core developers have access.
+
+After the status of the core developer in question is confirmed,
+access to the systems listed below is revoked and some changes are
+made to how the user displays to others.
+
+To respect the choices that someone made while alive, we aim to preserve
+content of their accounts without changes after they've passed away.
+To support the bereaved, in some instances, we may remove or change
+certain content when the legacy contact or family members request it.
+
+GitHub
+------
+
+* The user is removed from the `python/ <https://github.com/orgs/python/>`_
+  organization on GitHub;
+* The user is removed from the `psf/ <https://github.com/orgs/psf/>`_
+  organization on GitHub;
+* The user is removed from the `pypa/ <https://github.com/orgs/pypa/>`_
+  organization on GitHub.
+
+The PSF staff does not follow up with GitHub with regards to GitHub account
+cancellation as this action is reserved for next-of-kin or designated by
+the deceased GitHub user to act as an account successor.
+
+The general policy regarding deceased users on GitHub is described
+`here <https://docs.github.com/en/site-policy/other-site-policies/github-deceased-user-policy>`_.
+
+Repositories in the organization
+--------------------------------
+
+* The user's GitHub handle is removed from ``/.github/CODEOWNERS``.
+  To see all that need action, perform
+  `this query <https://github.com/search?q=org%3Apython+path%3A**%2F.github%2FCODEOWNERS+USERNAME&type=code>`_.
+* The user is marked as deceased in the private
+  `voters/python-core.toml <https://github.com/python/voters/blob/main/python-core.toml>`_
+  file with the ``left=`` field set to the day of passing, if known.
+
+discuss.python.org
+------------------
+
+* The user's "custom status" is set to 🕊 ``in memoriam``;
+* The user's "about me" is amended with ``$firstname passed away on $date. [In memoriam.]($in_memoriam_post_url)``;
+* In the user's security "recently used devices" the staff member
+  chooses "Log out all";
+* In the user's permissions the staff member chooses "Deactivate account";
+* The user's trust level is reset to ``1: basic user`` (trust level 0
+  doesn't allow links in "About Me");
+* The user's "associated accounts" (like GitHub) that provide an
+  alternative login method, are all disconnected;
+* The user's API keys are revoked;
+* The user's admin or moderator right is revoked;
+* The user's primary email address is reset to
+  ``USERNAME@in-memoriam.invalid`` and secondary email addresses are
+  removed (this step requires the administrator to contact Discourse.org
+  staff via ``team@discourse.org``).
+
+The "in memoriam" Discourse topic mentioned above is best created by
+a community member close to the deceased.
+
+The general best practice for deceased community members on
+Discourse-powered forums is described `here <https://meta.discourse.org/t/best-practices-for-deceased-community-members/146210>`_.
+
+python.org email account
+------------------------
+
+The PSF staff member emails ``postmaster@python.org`` to ask the email
+administrator to:
+
+* remove SMTP access from ``USERNAME@python.org``;
+* reset the password to POP3/IMAP for ``USERNAME@python.org``;
+* disable email forwarding, if set up, for ``USERNAME@python.org`` and
+  leave a record permanently as "in memoriam" to avoid future account
+  name reuse;
+* remove this email from all mailing lists under ``@python.org``;
+* remove any known alternate emails for the same user from all mailing
+  lists under ``@python.org``.
+
+In case the email shutdown causes issues for the estate executors, the
+PSF will reasonably try to help if contacted directly.
+
+python.org admin
+----------------
+
+* The user's account (``/admin/users/user``) is deactivated (NOT deleted)
+  and their staff and superuser status is unchecked;
+* The user's password is reset to a long random string;
+* The user's primary email address is set to
+  ``USERNAME@in-memoriam.invalid`` and set as unverified;
+* The user's secondary email addresses are deleted;
+* The user's API keys (both on the account and ``tastypie``) are deleted;
+* The user's "I would like to be a PSF Voting Member" field is cleared.
+
+devguide.python.org
+-------------------
+
+* The user is marked as deceased in `developers.csv <https://github.com/python/devguide/blob/main/core-developers/developers.csv>`_;
+* The user is removed from the `Experts Index <https://github.com/python/devguide/blob/main/core-developers/experts.rst>`_.
+
+bugs.python.org
+---------------
+
+While the issue tracker was migrated to GitHub, the Roundup instance
+is still up for historical purposes.
+
+* the PSF staff member logs into ``bugs.nyc1.psf.io``;
+* the PSF staff member runs ``roundup-admin`` to set the user's email
+  address to ``USERNAME@in-memoriam.invalid``;
+* the user's alternate emails are removed;
+* the user's password is reset to a long random string;
+* the PSF staff member removes any active login sessions from Postgres.
+
+Other PSF-related infrastructure
+--------------------------------
+
+* The PSF staff member notifies administrators of the Python Core Devs
+  Discord server to remove the user from the server. The PSF staff
+  does not follow up with Discord with regards to Discord account
+  cancellation. The general policy regarding deceased users on Discord
+  is available `here <https://support.discord.com/hc/en-us/articles/19872987802263--Deceased-or-Incapacitated-Users>`_.
+
+* The user is removed from Salt configuration for the PSF infrastructure
+  in `/pillar/base/users <https://github.com/python/psf-salt/tree/main/pillar/base/users>`_
+  that allows SSH access to PSF-controlled servers.
+
+* The user might have ran a buildbot worker. The PSF staff member will
+  look for that in the
+  `buildmaster-config <https://github.com/search?q=repo%3Apython%2Fbuildmaster-config%20USERNAME&type=code>`_
+  repository.
+
+PyPI
+----
+
+* The PSF staff member notifies PyPI admins by emailing them at
+  ``admin@pypi.org`` to mark the user as inactive, remove their email
+  addresses, prohibit their password resets, and revoke all API keys.

core-developers/motivations.rst

@@ -188,7 +188,7 @@ participating in the CPython core development process:
 .. topic:: Antoine Pitrou (France)
 
    * LinkedIn: `<https://www.linkedin.com/in/pitrou/>`_ (Senior Software Engineer)
-   * Voltron Data
+   * QuantStack
    * Python Software Foundation (Fellow)
    * Email address: antoine@python.org
 
@@ -199,12 +199,12 @@ participating in the CPython core development process:
    world, and by the concrete roadblocks he was hitting in professional
    settings.  Topics of choice have included interpreter optimizations,
    garbage collection, network programming, system programming and
-   concurrent programming (such as maintaining ``multiprocessing``).
+   concurrent programming.
 
    As a professional, Antoine has been first specializing in network
    programming, and more lately in open source data science infrastructure.
-   He is currently working full time on Apache Arrow as a technical leader
-   for Voltron Data.
+   He has made numerous contributions to Numba, Dask and is currently working
+   full time on Apache Arrow as a technical leader at QuantStack.
 
 .. topic:: Victor Stinner (France)
 

developer-workflow/c-api.rst

@@ -19,8 +19,13 @@ The C API is divided into these tiers:
 Each tier has different stability and maintenance requirements to consider
 when you add or change definitions in it.
 
-The compatibility guarantees for public C API are explained in the
-user documentation, ``Doc/c-api/stable.rst`` (:ref:`python:stable`).
+The public backwards compatibility guarantees for public C API are explained
+in the user documentation, ``Doc/c-api/stable.rst`` (:ref:`python:stable`).
+C language compatibility guarantees are in ``Doc/c-api/intro.rst``
+(:ref:`python:api-intro`).
+
+As core developers, we need to be more careful about compatibility than what
+we promise publicly. See :ref:`public-capi` for details.
 
 
 The internal API
@@ -93,6 +98,17 @@ CPython's public C API is available when ``Python.h`` is included normally
 It should be defined in ``Include/cpython/`` (unless part of the Limited API,
 see below).
 
+Before adding new public API, please ask in the `decisions repo`_ of
+the :pep:`C API workgroup <731>`.
+This helps us ensure *newly added* API is consistent and maintainable.
+
+Also check with the C API WG before requiring a C feature not present in C99.
+While the *public* docs only promise compatibility with C11, in practice
+we only intruduce C11 features individually as needed.
+
+.. _decisions repo: https://github.com/capi-workgroup/decisions/issues
+
+
 .. _public-api-guidelines:
 
 Guidelines for expanding/changing the public API