From d96a16743b98df9229ae41c47b39db04d96123b4 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Tue, 9 Dec 2025 17:23:11 -0800 Subject: [PATCH 1/3] rfc48: distinguish github organization/projects Problem: the governance doc discussed "the project", which could be confusing since "the project" is really a github organization that contains several github projects, that may have different maintainers. Add a sentence to the Project Governance intro to make this explicit. --- spec_48.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spec_48.rst b/spec_48.rst index 704b73f..6104359 100644 --- a/spec_48.rst +++ b/spec_48.rst @@ -40,6 +40,9 @@ The goal of this governance document is to clearly define the roles, responsibil Project Governance ****************** +The "project" refers to the flux-framework GitHub organization and all the +GitHub projects hosted within it. + The development and community management of the project will follow the governance rules described in this document. Project Maintainers From 7b05aaefbf72a2ff6afec8c1d874897bdb7d9aa3 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Tue, 9 Dec 2025 18:19:51 -0800 Subject: [PATCH 2/3] rfc48: refine Roles section Problem: maintainers are mentioned outside the Roles section, and administrators are not defined. Since we are distinguishing between individual project Maintainers and the framework Administrators, be explicit about that in the Roles section. --- spec_48.rst | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/spec_48.rst b/spec_48.rst index 6104359..092f6d1 100644 --- a/spec_48.rst +++ b/spec_48.rst @@ -45,15 +45,26 @@ GitHub projects hosted within it. The development and community management of the project will follow the governance rules described in this document. -Project Maintainers -=================== - -Project maintainers have admin access to the GitHub repository. Maintainers vary by GitHub project, and are viewable in the ``CODEOWNERS`` file provided in each respective project. - Roles ===== -This project includes the roles of **Maintainer** and **Contributor,** each of which is defined under `RFC 1 `_. +:doc:`spec_1` defines the following roles for each GitHub project within +the flux-framework organization: + +Contributor + A person who wishes to provide a patch. + +Maintainer + A person with commit access. The file ``MAINTAINERS.md`` within each + project defines the GitHub identities of the project Maintainers. + +In addition, we define the following role for the overall project, e.g. +the flux-framework organization: + +Administrator + A person with GitHub administrator access to the organization and all its + projects. The organization `README.md `_ + defines the GitHub identities of the organization administrators. Development Workflow ==================== From 5034048f13b89433ac77d667d22cd86510faceeb Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Tue, 9 Dec 2025 21:25:44 -0800 Subject: [PATCH 3/3] rfc48: rename collaborator to contributor Problem: collaborator and contributor are used interchangeably in this RFC. Use contributor. --- spec_48.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec_48.rst b/spec_48.rst index 092f6d1..0e9bf9a 100644 --- a/spec_48.rst +++ b/spec_48.rst @@ -90,14 +90,14 @@ Maintainer Review Issue Governance ---------------- -* Both collaborators and project maintainers may propose issues. The participation in the issue discussion is open and must follow the `Code of Conduct `_. +* Both contributors and project maintainers may propose issues. The participation in the issue discussion is open and must follow the `Code of Conduct `_. * The group of project maintainers will be responsible for assigning labels to issues, as well as for assigning the issue to a project maintainer or contributor. The `merge-when-passing` label MAY be applied by a maintainer to allow a pull request to be automatically merged once it has met all requirements. * The group of project maintainers SHOULD commit to responding to any issue within **72 hours** of the issue's creation. Pull Request Governance ----------------------- -* Both collaborators and project maintainers may propose pull requests. +* Both contributors and project maintainers may propose pull requests. * Pull requests SHOULD describe the contribution. The assignment of labels and assignees to the pull request is the responsibility of the project maintainers. * The group of project maintainers SHOULD provide feedback to any pull request within **72 hours** of the pull request's creation. * The decision of accepting (or rejecting) a pull request will be taken by the group of project maintainers. The criteria and process for making the decision is described in `RFC 1 "Development Process" `_.