From 2644a01fe9617fb0bf82e5faf9f2dd624f8361e8 Mon Sep 17 00:00:00 2001 From: sliptonic Date: Tue, 22 Aug 2023 17:27:21 -0500 Subject: [PATCH 1/3] Update CONTRIBUTING.md --- CONTRIBUTING.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index acd0999b9f..16561f2cf8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -93,8 +93,11 @@ The FreeCAD Contribution Process is expressed here with the following specific g ## 8. Project Administration -1. The project Administrators will manage the set of project Maintainers. They SHALL maintain a sufficiently large pool of Maintainers to ensure their succession and permit timely review of contributions. -2. Contributors who have a history of successful PRs and have demonstrated continued professionalism should be invited to be Maintainers. -3. Administrators SHOULD remove Maintainers who are inactive for an extended period, or who repeatedly fail to apply this process accurately. -4. The list of Maintainers SHALL be publicly accessible and reflective of current activity on the project. -5. Administrators SHOULD block or ban “bad actors” who cause stress, animosity, or confusion to others in the project. This SHOULD be done after public discussion, with a chance for all parties to speak. A bad actor is someone who repeatedly ignores the rules and culture of the project, who is hostile or offensive, who impedes the productive exchange of information, and who is unable to self-correct their behavior when asked to do so by others. +1. Project Administrators are those individuals who are members of the FreeCAD Github organization and have the role of 'owner'. They have the task of administering the organization including adding and removing individuals from various teams. +2. Project Administrator is a technical role necessitated by the GitHub platform. Except for the specific exceptions listed below, the Project Administrators do not make the decision about individual team members. Rather, they carry out the collective wishes of the Maintainers team. +3. The project Administrators will manage the set of project Maintainers. They SHALL maintain a sufficiently large pool of Maintainers to ensure their succession and permit timely review of contributions. If the pool of Maintainers is insufficient, the Project Administrators will request that the Maintainers select additional individuals to add. +5. Contributors who have a history of successful PRs and have demonstrated continued professionalism should be invited to be Maintainers. +6. Administrators SHOULD remove Maintainers who are inactive for an extended period, or who repeatedly fail to apply this process accurately. +7. The list of Maintainers SHALL be publicly accessible and reflective of current activity on the project. +8. Administrators SHALL act expediently to protect the FreeCAD infrastructure and resources. +9. Administrators SHOULD block or ban “bad actors” who cause stress, animosity, or confusion to others in the project. This SHOULD be done after public discussion, with a chance for all parties to speak. A bad actor is someone who repeatedly ignores the rules and culture of the project, who is hostile or offensive, who impedes the productive exchange of information, and who is unable to self-correct their behavior when asked to do so by others. From d38d949cf0d37dbc35507b34778c1e5c61f94c8c Mon Sep 17 00:00:00 2001 From: sliptonic Date: Tue, 22 Aug 2023 17:32:27 -0500 Subject: [PATCH 2/3] Clarify adding administrators --- CONTRIBUTING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 16561f2cf8..43124f6bcb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -94,8 +94,9 @@ The FreeCAD Contribution Process is expressed here with the following specific g ## 8. Project Administration 1. Project Administrators are those individuals who are members of the FreeCAD Github organization and have the role of 'owner'. They have the task of administering the organization including adding and removing individuals from various teams. -2. Project Administrator is a technical role necessitated by the GitHub platform. Except for the specific exceptions listed below, the Project Administrators do not make the decision about individual team members. Rather, they carry out the collective wishes of the Maintainers team. -3. The project Administrators will manage the set of project Maintainers. They SHALL maintain a sufficiently large pool of Maintainers to ensure their succession and permit timely review of contributions. If the pool of Maintainers is insufficient, the Project Administrators will request that the Maintainers select additional individuals to add. +2. Project Administrator is a technical role necessitated by the GitHub platform. Except for the specific exceptions listed below, the Project Administrators do not make the decision about individual team members. Rather, they carry out the collective wishes of the Maintainers team. Project Administrators will be selected from the Maintainers team but the Maintainers themselves. +3. To ensure continuity there SHALL be at least four Project Administrators at all times. +4. The project Administrators will manage the set of project Maintainers. They SHALL maintain a sufficiently large pool of Maintainers to ensure their succession and permit timely review of contributions. If the pool of Maintainers is insufficient, the Project Administrators will request that the Maintainers select additional individuals to add. 5. Contributors who have a history of successful PRs and have demonstrated continued professionalism should be invited to be Maintainers. 6. Administrators SHOULD remove Maintainers who are inactive for an extended period, or who repeatedly fail to apply this process accurately. 7. The list of Maintainers SHALL be publicly accessible and reflective of current activity on the project. From 8dc6c67fc02a215ef839bb27ddbee757d7e3b80f Mon Sep 17 00:00:00 2001 From: sliptonic Date: Wed, 23 Aug 2023 14:49:34 -0500 Subject: [PATCH 3/3] Update CONTRIBUTING.md Co-authored-by: Chris Hennes --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 43124f6bcb..b371e5f868 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -94,7 +94,7 @@ The FreeCAD Contribution Process is expressed here with the following specific g ## 8. Project Administration 1. Project Administrators are those individuals who are members of the FreeCAD Github organization and have the role of 'owner'. They have the task of administering the organization including adding and removing individuals from various teams. -2. Project Administrator is a technical role necessitated by the GitHub platform. Except for the specific exceptions listed below, the Project Administrators do not make the decision about individual team members. Rather, they carry out the collective wishes of the Maintainers team. Project Administrators will be selected from the Maintainers team but the Maintainers themselves. +2. Project Administrator is a technical role necessitated by the GitHub platform. Except for the specific exceptions listed below, the Project Administrators do not make the decision about individual team members. Rather, they carry out the collective wishes of the Maintainers team. Project Administrators will be selected from the Maintainers team by the Maintainers themselves. 3. To ensure continuity there SHALL be at least four Project Administrators at all times. 4. The project Administrators will manage the set of project Maintainers. They SHALL maintain a sufficiently large pool of Maintainers to ensure their succession and permit timely review of contributions. If the pool of Maintainers is insufficient, the Project Administrators will request that the Maintainers select additional individuals to add. 5. Contributors who have a history of successful PRs and have demonstrated continued professionalism should be invited to be Maintainers.