From 47cb63bbff41d03e9a73085d34eddbe7577dffac Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Thu, 9 Jan 2025 22:17:52 +0200 Subject: [PATCH 1/2] Update repo RM role policy regarding EOL branches --- developer-workflow/development-cycle.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/developer-workflow/development-cycle.rst b/developer-workflow/development-cycle.rst index d7031597e..68985a437 100644 --- a/developer-workflow/development-cycle.rst +++ b/developer-workflow/development-cycle.rst @@ -363,9 +363,9 @@ Repository release manager role policy Release Managers for :ref:`in-development `, :ref:`maintenance `, and :ref:`security mode ` Python releases are granted Administrator privileges on the repository. Once a release branch has -entered :ref:`end-of-life `, the Release Manager for that branch is -removed as an Administrator and granted sole privileges (out side of repository -administrators) to merge changes to that branch. +entered :ref:`end-of-life `, the Release Manager for that branch +creates a tag from the branch and deletes the branch. After this, they are +removed as an Administrator. Multi-Factor Authentication must be enabled by the user in order to retain access as a Release Manager of the branch. From 1fc0c0f327abe37bfea536f128d9ca14c75e5f6b Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Thu, 9 Jan 2025 23:21:23 +0200 Subject: [PATCH 2/2] Improve wording Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> --- developer-workflow/development-cycle.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/developer-workflow/development-cycle.rst b/developer-workflow/development-cycle.rst index 68985a437..aea1edb83 100644 --- a/developer-workflow/development-cycle.rst +++ b/developer-workflow/development-cycle.rst @@ -364,7 +364,7 @@ Release Managers for :ref:`in-development `, :ref:`maintenance `, and :ref:`security mode ` Python releases are granted Administrator privileges on the repository. Once a release branch has entered :ref:`end-of-life `, the Release Manager for that branch -creates a tag from the branch and deletes the branch. After this, they are +creates a final tag and deletes the branch. After this, they are removed as an Administrator. Multi-Factor Authentication must be enabled by the user in order to retain