Skip to content
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.

Sign up for GitHub

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

Point to new reporting form link (owned by conduct@mdanalysis.org) #4298

Merged
merged 5 commits into from
Sep 22, 2023
Merged

Point to new reporting form link (owned by conduct@mdanalysis.org) #4298

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8a6cfb
Point to new reporting form link (owned by conduct@mdanalysis.org)
jennaswa Sep 22, 2023
16f62d9
Add links to #reporting section
jennaswa Sep 22, 2023
b38fc07
Update CODE_OF_CONDUCT.md
lilyminium Sep 22, 2023
80a4d77
how do you escape an emacs session?
IAlibay Sep 22, 2023
a642099
add the empty line back
IAlibay Sep 22, 2023
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
21 changes: 12 additions & 9 deletions CODE_OF_CONDUCT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ every member in the MDAnalysis community so that everyone can
experience a welcoming, supportive, and productive environment that is
free from harassment.

<!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-generate-toc again -->
Copy link
Member

Choose a reason for hiding this comment

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

There we don't have to live under the tyranical rule of emacs anymore.

**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)

<!-- markdown-toc end -->
## MDAnalysis Code of Conduct and Community Guidelines

MDAnalysis is an engaged and respectful community made up of people from all
Expand All @@ -36,10 +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
emailing [*Conduct-email*][conduct-mail] or
in anonymous 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
Expand Down Expand Up @@ -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
Expand All @@ -129,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.

Expand Down Expand Up @@ -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