Update governance to reflect PEP 609

Per python/steering-council#30
PEP 609 is now approved.

Author: brainwane

source/code-of-conduct.rst

@@ -1,44 +1,13 @@
 .. _`Code of Conduct`:
 
-===========================
-Contributor Code of Conduct
-===========================
+===================
+PSF Code of Conduct
+===================
 
-As contributors and maintainers of these projects, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
+All PyPA contributors and maintainers are expected to follow the `PSF
+Code of Conduct`_.
 
-We are committed to making participation in these projects a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
+(PyPA previously had its own code of conduct separate from PSF's;
+:pep:`609` switched PyPA to PSF's Code of Conduct.
 
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct. By adopting this Code of Conduct,
-project maintainers commit themselves to fairly and consistently applying these
-principles to every aspect of managing this project. Project maintainers who do
-not follow or enforce the Code of Conduct may be permanently removed from the
-project team.
-
-This code of conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by opening an issue or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the `Contributor Covenant`_, version 1.2.0
-available at https://www.contributor-covenant.org/version/1/2/0/.
-
-.. _Contributor Covenant: https://www.contributor-covenant.org/
+.. _PSF Code of Conduct: https://www.python.org/psf/conduct/

source/members.rst

@@ -4,11 +4,12 @@
 PyPA Members, And How To Join
 =============================
 
-:Last Reviewed: 2020-06-08
+:Last Reviewed: 2020-07-20
 
-Historically, the PyPA has been a loose confederation of people
+Historically, the PyPA was a loose confederation of people
 and projects; the word "authority" in the name was meant to be
-a joke.
+a joke. :pep:`609` formalizes the PyPA somewhat and clarifies
+membership and governance rules.
 
 .. _`Does not require membership`:
 
@@ -17,7 +18,7 @@ Does not require membership
 
 Anyone is welcome to (while following licensing terms) use PyPA projects.
 
-Anyone is welcome to (while following the PyPA's :ref:`Code of Conduct`)
+Anyone is welcome to (while following the `PSF's Code of Conduct`_)
 contribute patches, bug reports, feature requests, ideas, questions,
 answers, and similar information in our `GitHub organization`_ and
 `Bitbucket organization`_ repositories, and discuss issues and plans
@@ -32,18 +33,16 @@ Project membership
 The PyPA member projects are those listed within our `GitHub organization`_
 and `Bitbucket organization`_.
 
-We currently do not have a codified process for inviting or accepting
-projects to be PyPA members. :pep:`609` is currently under discussion
-to formalize the process.
+Per :pep:`609`, any existing PyPA member can propose to accept a
+project into PyPA, and members vote to decide whether to accept that
+proposal. Criteria include the project adopting the PyPA's :ref:`Code
+of Conduct` and the project being relevant to Python packaging, as
+determined by existing members of PyPA.
 
-In the interim, to request PyPA project membership, start a thread on
+To request PyPA project membership, start a thread on
 `the Packaging category on discuss.python.org`_ or on `the
-distutils-sig mailing list`_ requesting PyPA project
-membership. Criteria include the project adopting the PyPA's
-:ref:`Code of Conduct` and the project being relevant to Python
-packaging, as determined by existing members of PyPA. The decision
-will rest with the PyPA organizational administrators on GitHub or
-Bitbucket.
+distutils-sig mailing list`_ requesting such a vote.
+
 
 .. _`Individual membership`:
 
@@ -53,22 +52,21 @@ Individual membership
 Maintainership of a project that is under the PyPA organization
 automatically transfers individual membership in the PyPA. The PyPA
 individual members are those who have maintainer status (also known as
-committer status or write permissions) on any projects within the PyPA
-`GitHub organization`_ or `Bitbucket organization`_. Currently there is
-no public list of all PyPA individual members.
-
-The PyPA currently does not have a codified process for inviting or
-accepting individuals to be PyPA members.
+committer status or write permissions) or triage permissions on any
+projects within the PyPA `GitHub organization`_ or `Bitbucket
+organization`_. Currently there is no public list of all PyPA
+individual members.
 
-To become an individual member of the PyPA, you can do either of the following:
+Per :pep:`609`, to become an individual member of the PyPA, you can do
+either of the following:
 
 1. attain PyPA project membership for your project (for which you are already a maintainer)
-2. attain maintainership in a project that is already a PyPA member project
+2. attain maintainership or triage permissions in a project that is already a PyPA member project
 
 PyPA member projects each make their own decisions regarding granting
-maintainer rights.  :pep:`609`, if accepted, would not alter this.
-
+maintainer and triager rights to individuals.
 
+.. _PSF's Code of Conduct: https://www.python.org/psf/conduct/
 .. _GitHub organization: https://github.com/pypa
 .. _Bitbucket organization: https://bitbucket.org/pypa
 .. _the Packaging category on discuss.python.org: https://discuss.python.org/c/packaging

source/roadmap.rst

@@ -4,7 +4,7 @@
 PyPA Roadmap
 ============
 
-:Last Reviewed: 2020-06-08
+:Last Reviewed: 2020-07-20
 
 A status page for the  major PyPA Todo items that will determine the course of Python Packaging.
 
@@ -350,10 +350,14 @@ PyPA PEP Process
 PyPA Governance
 ~~~~~~~~~~~~~~~
 
-:Last Reviewed: 2020-06-08
+:Last Reviewed: 2020-07-20
 
 :Summary: :pep:`609` suggests a governing model that aims to formalize
 	  existing practices.
 
 :Status:
-         Under discussion since November 2019.
+         :pep:`609` is approved. The PyPA and the Steering Council will
+         continue to discuss and refine the scope of the PEP process,
+         how and when it applies to packaging-specific standards and
+         architecture decisions, and how we all might adapt governance
+         processes further.