From 8d6bc33694d853db98e1b9679ec4ee923b0d21ea Mon Sep 17 00:00:00 2001 From: Sam Cunliffe Date: Tue, 22 Oct 2024 14:08:09 +0100 Subject: [PATCH 1/4] Compromise resolution to #350. --- CONTRIBUTING.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3bc57e5f..2b5fbe3a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,10 +9,16 @@ We are actively encouraging users to ask questions and start discussions in the [discussions tab] of this repository. Does something seem like it's broken? Please go ahead and [open an issue]! -The [website] pages are open to contributions but they will need to be reviewed -by a member or associate member of ARC. We might be slow to approve new tool -suggestions (since we'll probably want to discuss them first) but don't let that -put you off creating an issue. +The template and [website] pages are open to contributions! But they will need +to be reviewed by a member or associate member of ARC. + +We will probably be slow to approve new tool suggestions (since we'll probably +want to discuss them first) but don't let that put you off creating an issue! + +Any controversial changes should be approved by at least two reviewers who are +members or associate members of ARC. Pull-request authors are trusted to add two +reviewers to anything that they think might be controversial. If a reviewer adds +a second reviewer, please wait for both to approve before merging. ## Development workflow From ba92e37e96995b35b75ea12ca98ca3487dc3b77a Mon Sep 17 00:00:00 2001 From: Sam Cunliffe Date: Mon, 4 Nov 2024 13:07:34 +0000 Subject: [PATCH 2/4] =?UTF-8?q?Controversial=20=E2=86=92=20opinion(ated)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2b5fbe3a..9bdba183 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,9 +15,9 @@ to be reviewed by a member or associate member of ARC. We will probably be slow to approve new tool suggestions (since we'll probably want to discuss them first) but don't let that put you off creating an issue! -Any controversial changes should be approved by at least two reviewers who are +Any opinion changes should be approved by at least two reviewers who are members or associate members of ARC. Pull-request authors are trusted to add two -reviewers to anything that they think might be controversial. If a reviewer adds +reviewers to anything that they think might be opinionated. If a reviewer adds a second reviewer, please wait for both to approve before merging. ## Development workflow From 6ccb492b92783d217979af400e9a00493bf0245f Mon Sep 17 00:00:00 2001 From: Sam Cunliffe Date: Mon, 4 Nov 2024 15:27:54 +0000 Subject: [PATCH 3/4] Consistently "opinionated" Co-authored-by: Matt Graham --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9bdba183..179da725 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,7 +15,7 @@ to be reviewed by a member or associate member of ARC. We will probably be slow to approve new tool suggestions (since we'll probably want to discuss them first) but don't let that put you off creating an issue! -Any opinion changes should be approved by at least two reviewers who are +Any opinionated changes should be approved by at least two reviewers who are members or associate members of ARC. Pull-request authors are trusted to add two reviewers to anything that they think might be opinionated. If a reviewer adds a second reviewer, please wait for both to approve before merging. From 222faf00bc9dd1571134510f8c4c534264c156d5 Mon Sep 17 00:00:00 2001 From: Sam Cunliffe Date: Mon, 4 Nov 2024 15:33:20 +0000 Subject: [PATCH 4/4] Add two reviewers to the workflow. --- CONTRIBUTING.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 052f554b..acfc8ca3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,8 +30,9 @@ To contribute a change, please: the tests pass if you modified the template (`pytest -s`). 3. Open a _pull request_ (PR) with changes. 4. Ask someone who did not contribute to the PR from [@UCL-ARC/collaborations] - to review it. -5. If approved with no comments, then the reviewer will merge the PR. + to review it. If it should have two reviewers, you can also request a review + from [@UCL-ARC/collaborations-python-tooling] and add the `needs-2-reviewers` label. +5. If approved with no comments, then the last approving reviewer should merge the PR. 6. If changes are requested, the PR author should address the comments, and then ask for review again. @@ -85,6 +86,7 @@ See the [jekyll docs] for more info. [Research software engineers]: https://society-rse.org/about/history [pre-commit]: https://pre-commit.com [@UCL-ARC/collaborations]: https://github.com/orgs/UCL-ARC/teams/collaborations +[@UCL-ARC/collaborations-python-tooling]: https://github.com/orgs/UCL-ARC/teams/collaborations-python-tooling [uv tool]: https://docs.astral.sh/uv/guides/tools [Install jekyll]: https://jekyllrb.com/docs/installation [jekyll docs]: https://jekyllrb.com/docs