From a8a6cfb7ffbd621f963d6dde9d53ed6a6233f2de Mon Sep 17 00:00:00 2001 From: Jenna M Swarthout Goddard <38287809+jennaswa@users.noreply.github.com> Date: Fri, 22 Sep 2023 15:18:58 +0200 Subject: [PATCH 1/5] Point to new reporting form link (owned by conduct@mdanalysis.org) --- CODE_OF_CONDUCT.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 2c2b789ab82..afb2610bf89 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -37,9 +37,7 @@ However, sometimes these informal processes may be inadequate: they fail to work, there is urgency or risk to someone, nobody is intervening publicly and you don't feel comfortable speaking in public, etc. For these or other reasons, structured follow-up may be necessary and here we provide the means for that: we -welcome reports by -emailing [*Conduct-email*][conduct-mail] or -in anonymous by filling out [*this form*][conduct-form]. +welcome reports by filling out [*this form*][conduct-form]. This code applies equally to founders, developers, mentors and new community members, in all spaces managed by MDAnalysis. This @@ -109,6 +107,12 @@ at our [*user-mailing-list*](mailto:mdnalysis-discussions@googlegroups.com). and telling someone that you are sorry is act of empathy that doesn’t automatically imply an admission of guilt. +## Diversity, Equity, and Inclusion Statement + +MDAnalysis strives to ensure a welcoming, inclusive space for all. As a [*NumFOCUS*](https://numfocus.org/) sponsored project, we fully support their [*Diversity & Inclusion in Scientific Computing*](https://numfocus.org/programs/diversity-inclusion) (DISC) mission and abide by their Diversity Statement: + +> *"NumFOCUS welcomes and encourages participation in our community by people of all backgrounds and identities. We are committed to promoting and sustaining a culture that values mutual respect, tolerance, and learning, and we work together as a community to help each other live out these values."* + ## Reporting If someone makes you or any other contributor feel unsafe or unwelcome, please @@ -172,8 +176,7 @@ materials under open licensing terms for us to easily reuse. All content on this page is licensed under a [*Creative Commons Attribution*](http://creativecommons.org/licenses/by/3.0/) license. -[conduct-mail]: mailto:mdnalysis-conduct@googlegroups.com -[conduct-form]: https://goo.gl/forms/w2IwBKkY3oT0aVEB3 +[conduct-form]: https://forms.gle/r2SMU4XcwM814CpJ9 [NF-conduct]: https://numfocus.org/code-of-conduct From 16f62d921ba2bd00e1b5d8230b2e30ca7f91e8e9 Mon Sep 17 00:00:00 2001 From: Jenna M Swarthout Goddard <38287809+jennaswa@users.noreply.github.com> Date: Fri, 22 Sep 2023 16:35:56 +0200 Subject: [PATCH 2/5] Add links to #reporting section --- CODE_OF_CONDUCT.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index afb2610bf89..f26ab37f495 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -36,8 +36,8 @@ a misunderstanding and de-escalate things. However, sometimes these informal processes may be inadequate: they fail to work, there is urgency or risk to someone, nobody is intervening publicly and you don't feel comfortable speaking in public, etc. For these or other reasons, -structured follow-up may be necessary and here we provide the means for that: we -welcome reports by filling out [*this form*][conduct-form]. +structured follow-up may be necessary and here we provide the means for that: [we +welcome reports](#reporting) by filling out [*this form*][conduct-form]. This code applies equally to founders, developers, mentors and new community members, in all spaces managed by MDAnalysis. This @@ -133,7 +133,7 @@ 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. +If you are attending an MDAnalysis event or meetup and wish to [make a report](#reporting), 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. From b38fc070c16d3bf767090b2c6ad3a747d2e42d48 Mon Sep 17 00:00:00 2001 From: Lily Wang <31115101+lilyminium@users.noreply.github.com> Date: Fri, 22 Sep 2023 15:50:27 +0100 Subject: [PATCH 3/5] Update CODE_OF_CONDUCT.md Add TOC of DEI --- CODE_OF_CONDUCT.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f26ab37f495..867843a3400 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -7,6 +7,7 @@ free from harassment. **Table of Contents** - [MDAnalysis Code of Conduct and Community Guidelines](#mdanalysis-code-of-conduct-and-community-guidelines) +- [Diversity, Equity, and Inclusion Statement](#diversity-equity-and-inclusion-statement) - [Reporting](#reporting) - [Enforcement](#enforcement) - [Acknowledgment](#acknowledgment) From 80a4d77b3210e6b28f611a4234cb67bc1457199c Mon Sep 17 00:00:00 2001 From: Irfan Alibay Date: Fri, 22 Sep 2023 17:37:50 +0100 Subject: [PATCH 4/5] how do you escape an emacs session? --- 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 867843a3400..def463d35e1 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -3,16 +3,14 @@ every member in the MDAnalysis community so that everyone can experience a welcoming, supportive, and productive environment that is free from harassment. - **Table of Contents** - - [MDAnalysis Code of Conduct and Community Guidelines](#mdanalysis-code-of-conduct-and-community-guidelines) - [Diversity, Equity, and Inclusion Statement](#diversity-equity-and-inclusion-statement) - [Reporting](#reporting) + * [Reporting at MDAnalysis Events and Meetups](#reporting-at-mdanalysis-events-and-meetups) - [Enforcement](#enforcement) - [Acknowledgment](#acknowledgment) - ## MDAnalysis Code of Conduct and Community Guidelines MDAnalysis is an engaged and respectful community made up of people from all From a6420990f817dde8037e16e77d0cafb1cbb0f6c7 Mon Sep 17 00:00:00 2001 From: Irfan Alibay Date: Fri, 22 Sep 2023 17:38:24 +0100 Subject: [PATCH 5/5] add the empty line back --- CODE_OF_CONDUCT.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index def463d35e1..70953c07dda 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -4,6 +4,7 @@ experience a welcoming, supportive, and productive environment that is free from harassment. **Table of Contents** + - [MDAnalysis Code of Conduct and Community Guidelines](#mdanalysis-code-of-conduct-and-community-guidelines) - [Diversity, Equity, and Inclusion Statement](#diversity-equity-and-inclusion-statement) - [Reporting](#reporting)