Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions _data/team/roles/code_of_conduct.yml
Original file line number Diff line number Diff line change
@@ -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.
Comment on lines +3 to +4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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:
- 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use {{ site.baseurl }}

Suggested change
- 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
- 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](https://www.mdanalysis.org/pages/governance/), original reporter, and any other affeccted parties (project leadership is tasked with enforcement)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{{ site.baseurl }}

Suggested change
- 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)
- 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:
- "[Jenna Swarthout Goddard](https://github.com/jennaswa)"
Expand Down
10 changes: 3 additions & 7 deletions conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
You can find the whole document here: [https://numfocus.org/code-of-conduct][NF-conduct].
You can find the whole document here: [https://numfocus.org/code-of-conduct](NF-conduct).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original was correct: this is a named link in markdown (see line 95)


### THE SHORT VERSION
MDAnalysis and NumFOCUS are dedicated to providing a harassment-free community for everyone,
Expand Down Expand Up @@ -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.

Expand All @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{{ site.baseurl }}

Suggested change
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
Expand All @@ -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
Loading