-
Notifications
You must be signed in to change notification settings - Fork 47
Update conduct.md and CoCC team responsibilities #481
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| 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. | ||||||
| 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 | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Use
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) | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| - Keep confidential records of how reported incidents were handled | ||||||
|
|
||||||
| current_members: | ||||||
| - "[Jenna Swarthout Goddard](https://github.com/jennaswa)" | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -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]. | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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, | ||||||
|
|
@@ -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 | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| 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 | ||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.