From 11faa2dbb856b7d56a0686b536f5f5435f8a119d Mon Sep 17 00:00:00 2001 From: Jenna M Swarthout Goddard <38287809+jennaswa@users.noreply.github.com> Date: Fri, 15 Sep 2023 16:40:46 +0200 Subject: [PATCH 1/7] Remove option to report by email The CoC Committee voted on Sep 1, 2023 to remove the mailing list option. See notes from the meeting leading to this recommendation here: https://docs.google.com/document/d/1TyTOm7Z-769l8BV0v1oncBBETVEqiiQayHqk3dNg7yo/edit?usp=sharing --- CODE_OF_CONDUCT.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index d80e9f485b9..c2b0733d719 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -117,9 +117,7 @@ the community for everyone and we take them seriously. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. -You can file a report by emailing -the [*Conduct-mail*][conduct-mail] or by -filing out [this form][conduct-form]. The project team is obligated to maintain +You can file a report by filling out [this form][conduct-form]. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. The online form gives you the option to keep your report anonymous or request From 68871b360de8d0a9f17495784224268e41e36710 Mon Sep 17 00:00:00 2001 From: Jenna M Swarthout Goddard <38287809+jennaswa@users.noreply.github.com> Date: Fri, 15 Sep 2023 16:50:07 +0200 Subject: [PATCH 2/7] Clarify that 'we' refers to CoC Committee --- CODE_OF_CONDUCT.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index c2b0733d719..89353fd62ce 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -112,12 +112,12 @@ at our [*user-mailing-list*](mailto:mdnalysis-discussions@googlegroups.com). ## Reporting If someone makes you or any other contributor feel unsafe or unwelcome, please -report this in a timely manner. Code of conduct violations reduce the value of +report this in a timely manner. Code of conduct (CoC) violations reduce the value of the community for everyone and we take them seriously. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. -You can file a report by filling out [this form][conduct-form]. The project team is obligated to maintain +You can file a report by filling out [this form][conduct-form]. The CoC Committee is obligated to maintain confidentiality with regard to the reporter of an incident. The online form gives you the option to keep your report anonymous or request @@ -130,9 +130,9 @@ community. ## Enforcement -When a report is sent to us we will reply as soon as possible to confirm receipt; -we strive to answer in less than 24 hours. We will review the incident and -determine, to the best of our ability +When a report is filed, the CoC Committee will reply as soon as possible to confirm receipt; +we strive to answer in less than 24 hours. The CoC Committee will review the incident and +determine, to the best of its ability - what happened - whether this event constitutes a code of conduct violation @@ -141,12 +141,11 @@ determine, to the best of our ability This information will be collected in writing. We strive to reach a resolution within a week of confirmation. Once a resolution has been agreed upon, but before it is -enacted, we will contact the original reporter and any other affected parties +enacted, the CoC Committee will contact the original reporter and any other affected parties and explain the proposed resolution. We will ask if this resolution is acceptable and note feedback for the record. We are, however, not required to act on this feedback. - ## Acknowledgment Original text courtesy of From 17479054b27d9edc64fc337667a28e3a2e238ba6 Mon Sep 17 00:00:00 2001 From: Jenna M Swarthout Goddard <38287809+jennaswa@users.noreply.github.com> Date: Fri, 15 Sep 2023 16:53:11 +0200 Subject: [PATCH 3/7] Add reporting procedures for events --- CODE_OF_CONDUCT.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 89353fd62ce..de87331b828 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -128,6 +128,11 @@ You may also follow [NumFOCUS’s Code of Conduct violation reporting][NF-conduc guidelines if you would like to contact a third-party outside of the MDAnalysis community. +### Reporting at MDAnalysis Events and Meetups +If you are attending an MDAnalysis event or meetup and wish to make a report, you may contact the ombudspersons (who will identify themselves at the event) or other event staff/meetup organizers so that they can take any appropriate immediate response. If you would prefer not to do that, please [submit a report][conduct-form] to MDAnalysis. + +Ombudspeople and event staff/meetup organizers will be happy to help participants contact venue security or local law enforcement, provide escorts, or otherwise assist those experiencing harassment to feel safe for the duration of the event/meetup. + ## Enforcement When a report is filed, the CoC Committee will reply as soon as possible to confirm receipt; From 6e6840299ef37a5495b7af31aa5a53485daa2f3f Mon Sep 17 00:00:00 2001 From: Jenna M Swarthout Goddard <38287809+jennaswa@users.noreply.github.com> Date: Fri, 15 Sep 2023 17:00:43 +0200 Subject: [PATCH 4/7] Add test to clarify that CoC Committee is responsible for enforcement Instead of including names of CoC Committee members here, it would be best to move names to the Roles & Responsibilities page when it is up (#300) and provide a link --- CODE_OF_CONDUCT.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index de87331b828..97d3d6ae34a 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -135,6 +135,12 @@ Ombudspeople and event staff/meetup organizers will be happy to help participant ## Enforcement +All reports of breaches of the code of conduct will be investigated and handled by the **MDAnalysis Code of Conduct Committee**. The current MDAnalysis Code of Conduct Committee consists of: +- Jenna Swarthout Goddard (@jennaswa) +- Micaela Matta (@micaela-matta) +- Richard Gowers (@richardjgowers) +In the event of any conflict of interest, the affected committee member will immediately notify the rest of the committee and recuse themselves if necessary. + When a report is filed, the CoC Committee will reply as soon as possible to confirm receipt; we strive to answer in less than 24 hours. The CoC Committee will review the incident and determine, to the best of its ability From 39d97850a775ab3cc5af92460196d8e3be8e7603 Mon Sep 17 00:00:00 2001 From: Jenna M Swarthout Goddard <38287809+jennaswa@users.noreply.github.com> Date: Fri, 15 Sep 2023 17:07:15 +0200 Subject: [PATCH 5/7] Add NF to acknowledgment (for event text) --- CODE_OF_CONDUCT.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 97d3d6ae34a..cf91534ed97 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -159,8 +159,7 @@ on this feedback. ## Acknowledgment -Original text courtesy of -the +Original text courtesy of [*NumFOCUS*](https://numfocus.org/code-of-conduct) and the [*Speak Up!*](http://web.archive.org/web/20141109123859/http://speakup.io/coc.html), [*Django*](https://www.djangoproject.com/conduct), [*Contributor Covenant*](http://contributor-covenant.org/), From fb4f225d553f3022ce1455e0a1fd27476c7a368f Mon Sep 17 00:00:00 2001 From: Jenna M Swarthout Goddard <38287809+jennaswa@users.noreply.github.com> Date: Mon, 18 Sep 2023 15:14:20 +0200 Subject: [PATCH 6/7] Remove "if necessary" for recusing in COI cases Co-authored-by: Oliver Beckstein --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index cf91534ed97..39e7220e44e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -139,7 +139,7 @@ All reports of breaches of the code of conduct will be investigated and handled - Jenna Swarthout Goddard (@jennaswa) - Micaela Matta (@micaela-matta) - Richard Gowers (@richardjgowers) -In the event of any conflict of interest, the affected committee member will immediately notify the rest of the committee and recuse themselves if necessary. +In the event of any conflict of interest, the affected committee member will immediately notify the rest of the committee and recuse themselves. When a report is filed, the CoC Committee will reply as soon as possible to confirm receipt; we strive to answer in less than 24 hours. The CoC Committee will review the incident and From 914efe30953de3aa5b03bad6664847cc19cf3d7e Mon Sep 17 00:00:00 2001 From: Jenna M Swarthout Goddard <38287809+jennaswa@users.noreply.github.com> Date: Mon, 18 Sep 2023 15:16:45 +0200 Subject: [PATCH 7/7] Add line break --- CODE_OF_CONDUCT.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 39e7220e44e..2c2b789ab82 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -139,6 +139,7 @@ All reports of breaches of the code of conduct will be investigated and handled - Jenna Swarthout Goddard (@jennaswa) - Micaela Matta (@micaela-matta) - Richard Gowers (@richardjgowers) + In the event of any conflict of interest, the affected committee member will immediately notify the rest of the committee and recuse themselves. When a report is filed, the CoC Committee will reply as soon as possible to confirm receipt;