From 9d6ddd62f0c30e74fee15b8d066dbf91dadd8059 Mon Sep 17 00:00:00 2001 From: Jenna M Swarthout Goddard <38287809+jennaswa@users.noreply.github.com> Date: Mon, 20 Oct 2025 16:07:29 +0200 Subject: [PATCH 1/3] Update conduct.md Sync fixes from https://github.com/MDAnalysis/mdanalysis/pull/5133 --- conduct.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/conduct.md b/conduct.md index 225122fe..1d3fbbe5 100644 --- a/conduct.md +++ b/conduct.md @@ -20,7 +20,7 @@ project, MDAnalysis follows the [NumFOCUS Code of Conduct][NF-conduct]. - [Acknowledgment](#acknowledgment) ## MDANALYSIS CODE OF CONDUCT -You can find the whole document here: https://numfocus.org/code-of-conduct. +You can find the whole document here: [https://numfocus.org/code-of-conduct][NF-conduct]. ### THE SHORT VERSION MDAnalysis and NumFOCUS are dedicated to providing a harassment-free community for everyone, @@ -49,7 +49,7 @@ using the [NumFOCUS Code of Conduct Reporting Form](https://numfocus.typeform.co If you are attending an MDAnalysis event or meetup and wish to make a report that requires an appropriate immediate response, you may contact the ombudspersons (who will identify themselves at the event) or other event staff/meetup organizers. If you would prefer not to -do that, please [submit a report](how-to-report) to NumFOCUS, but please note it may not be +do that, please [submit a report](#how-to-report) to NumFOCUS, but please note it may not be possible for the [NumFOCUS Code of Conduct Working Group](#who-will-receive-your-report) to respond immediately. @@ -67,7 +67,7 @@ You can learn more about the current group members, as well as the reporting pro ### ENFORCEMENT Based on recommendations for next steps as determined by the NumFOCUS Code of Conduct Working Group, the MDAnalysis project will remain responsible for making the final decision and implementing any -resulting actions. See the [MDanalysis team](https://www.mdanalysis.org/pages/team/#roles) page on +resulting actions. See the [MDAnalysis team](https://www.mdanalysis.org/pages/team/#roles) page on the MDAnalysis website for a current list of the **MDAnalysis Code of Conduct Committee** members. Once a resolution has been agreed upon, but before it is enacted, the MDAnalysis Code of Conduct @@ -93,7 +93,3 @@ license. [NF]: https://numfocus.org/ [NF-conduct]: https://numfocus.org/code-of-conduct - -[conduct-form]: https://forms.gle/r2SMU4XcwM814CpJ9 - -[NF-conduct]: https://numfocus.org/code-of-conduct From 50c2176cefb476f45ee1f85fd7b0776e7df1dc25 Mon Sep 17 00:00:00 2001 From: Jenna M Swarthout Goddard <38287809+jennaswa@users.noreply.github.com> Date: Mon, 20 Oct 2025 16:30:01 +0200 Subject: [PATCH 2/3] Fix broken links on teams page and align with NF CoC process Closes https://github.com/MDAnalysis/MDAnalysis.github.io/issues/474 --- _data/team/roles/code_of_conduct.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/_data/team/roles/code_of_conduct.yml b/_data/team/roles/code_of_conduct.yml index fc4d39c4..72dc34ac 100644 --- a/_data/team/roles/code_of_conduct.yml +++ b/_data/team/roles/code_of_conduct.yml @@ -1,11 +1,12 @@ role: Code of conduct committee description: | - The [code of conduct committee](https://www.mdanalysis.org/pages/conduct/) members - are elected by the [project leadership](https://www.mdanalysis.org/about/#governance) when a committee members' term limit (2 years) has expired. + The [code of conduct](https://www.mdanalysis.org/conduct/) committee members + are elected by the [project leadership](https://www.mdanalysis.org/pages/governance/) when a committee members' term limit (2 years) has expired. tasks: - - Receive and investigate all code of conduct complaints and violations - - Propose actions and sanctions, as necessary, to the [project leadership](https://www.mdanalysis.org/about/#governance) (project leadership is tasked with enforcement) - - Periodically review, revise and update current code of conduct procedures + - Ensure that the application of the code of conduct remains up-to-date, reflecting any changes from the NumFOCUS and MDAnalysis communities + - Coordinate with and defer to the [NumFOCUS Code of Conduct Working Group](https://www.mdanalysis.org/conduct/#who-will-receive-your-report) for complaints/violation reports and initial recommendations + - Propose actions and sanctions, as necessary, to the [project leadership](https://www.mdanalysis.org/pages/governance/), original reporter, and any other affeccted parties (project leadership is tasked with enforcement) + - Keep confidential records of how reported incidents were handled current_members: - "[Jenna Swarthout Goddard](https://github.com/jennaswa)" From 61ca607830070d55ea40078bf67b9c6994cd45ad Mon Sep 17 00:00:00 2001 From: Oliver Beckstein Date: Wed, 5 Nov 2025 19:20:01 -0700 Subject: [PATCH 3/3] replace absolute links with {{ site.baseurl }} --- _data/team/roles/code_of_conduct.yml | 8 ++++---- conduct.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_data/team/roles/code_of_conduct.yml b/_data/team/roles/code_of_conduct.yml index 72dc34ac..ce084be9 100644 --- a/_data/team/roles/code_of_conduct.yml +++ b/_data/team/roles/code_of_conduct.yml @@ -1,11 +1,11 @@ role: Code of conduct committee description: | - The [code of conduct](https://www.mdanalysis.org/conduct/) committee members - are elected by the [project leadership](https://www.mdanalysis.org/pages/governance/) when a committee members' term limit (2 years) has expired. + The [code of conduct]({{ site.baseurl }}/conduct/) committee members + are elected by the [project leadership]({{ site.baseurl }}/pages/governance/) when a committee members' term limit (2 years) has expired. tasks: - Ensure that the application of the code of conduct remains up-to-date, reflecting any changes from the NumFOCUS and MDAnalysis communities - - Coordinate with and defer to the [NumFOCUS Code of Conduct Working Group](https://www.mdanalysis.org/conduct/#who-will-receive-your-report) for complaints/violation reports and initial recommendations - - Propose actions and sanctions, as necessary, to the [project leadership](https://www.mdanalysis.org/pages/governance/), original reporter, and any other affeccted parties (project leadership is tasked with enforcement) + - Coordinate with and defer to the [NumFOCUS Code of Conduct Working Group]({{ site.baseurl }}/conduct/#who-will-receive-your-report) for complaints/violation reports and initial recommendations + - Propose actions and sanctions, as necessary, to the [project leadership]({{ site.baseurl }}/pages/governance/), original reporter, and any other affeccted parties (project leadership is tasked with enforcement) - Keep confidential records of how reported incidents were handled current_members: diff --git a/conduct.md b/conduct.md index 1d3fbbe5..e365da24 100644 --- a/conduct.md +++ b/conduct.md @@ -67,7 +67,7 @@ You can learn more about the current group members, as well as the reporting pro ### ENFORCEMENT Based on recommendations for next steps as determined by the NumFOCUS Code of Conduct Working Group, the MDAnalysis project will remain responsible for making the final decision and implementing any -resulting actions. See the [MDAnalysis team](https://www.mdanalysis.org/pages/team/#roles) page on +resulting actions. See the [MDAnalysis team]({{ site.baseurl }}/pages/team/#roles) page on the MDAnalysis website for a current list of the **MDAnalysis Code of Conduct Committee** members. Once a resolution has been agreed upon, but before it is enacted, the MDAnalysis Code of Conduct