From b6475c6f1d56fdf489d747ad790b5a88b0057518 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 23 Oct 2020 17:41:00 +0100 Subject: [PATCH 1/5] Add contributor covenant CoC --- .github/CODE_OF_CONDUCT.md | 6 -- CODE_OF_CONDUCT.md | 129 +++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 6 deletions(-) delete mode 100644 .github/CODE_OF_CONDUCT.md create mode 100644 CODE_OF_CONDUCT.md diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md deleted file mode 100644 index bb4a6a8a28c7..000000000000 --- a/.github/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,6 +0,0 @@ -Matplotlib follows the Python Software Foundation Code of Conduct in everything we do, -see https://www.python.org/psf/conduct/. - -Report violations to matplotlib@numfocus.org, which is checked by Hannah Aizenman (@story645) and Thomas Caswell (@tacaswell). - -You can also use the NumFocus Code of Conduct [Reporting Form](https://numfocus.typeform.com/to/ynjGdT). diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000000..eba53b6c3398 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,129 @@ + +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, religion, or sexual identity +and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the + overall community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or + advances of any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email + address, without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +[INSERT CONTACT METHOD]. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series +of actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or +permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within +the community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.0, available at +https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. + +Community Impact Guidelines were inspired by [Mozilla's code of conduct +enforcement ladder](https://github.com/mozilla/diversity). + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see the FAQ at +https://www.contributor-covenant.org/faq. Translations are available at +https://www.contributor-covenant.org/translations. From a3ed81d14f5370fb4228f72919b021df85a678ee Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 23 Oct 2020 17:42:27 +0100 Subject: [PATCH 2/5] Add contact details --- CODE_OF_CONDUCT.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index eba53b6c3398..320f38d2774e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -61,7 +61,8 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at -[INSERT CONTACT METHOD]. +matplotlib@numfocus.org (monitored by Thomas Caswell and Hannah Aizenman), or +senior NumFOCUS staff at conduct@numfocus.org. All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the From 49f920b4b6e9a8162888bfa07807c7cbb820a4f9 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Sun, 25 Oct 2020 12:13:51 +0000 Subject: [PATCH 3/5] Update coc links --- doc/devel/contributing.rst | 8 ++++---- doc/index.rst | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst index 9a8cf50ab546..63dfed9aff98 100644 --- a/doc/devel/contributing.rst +++ b/doc/devel/contributing.rst @@ -5,12 +5,12 @@ Contributing ============ This project is a community effort, and everyone is welcome to -contribute. We follow the `Python Software Foundation Code of Conduct -`_ in everything we do. +contribute. Everyone within the community +is expected to abide by our `code of conduct <../../CODE_OF_CONDUCT.md>`_. -The project is hosted on https://github.com/matplotlib/matplotlib +The project is hosted on +https://github.com/matplotlib/matplotlib -.. _coc: http://www.python.org/psf/codeofconduct/ .. _submitting-a-bug-report: diff --git a/doc/index.rst b/doc/index.rst index fdb15ec9992f..2d08c108a161 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -77,10 +77,8 @@ Trying to learn how to do a particular kind of plot? Check out the Join our community! ~~~~~~~~~~~~~~~~~~~ -Matplotlib is a welcoming, inclusive project, and we follow the `Python -Software Foundation Code of Conduct `_ in everything we do. - -.. _coc: https://www.python.org/psf/conduct/ +Matplotlib is a welcoming, inclusive project, and everyone within the community +is expected to abide by our `code of conduct <../CODE_OF_CONDUCT.md>`_. .. raw:: html From 99ce68cf2bff3a31abacbc1aa338b3584e21fdb2 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Sun, 25 Oct 2020 12:16:56 +0000 Subject: [PATCH 4/5] Update contact details --- CODE_OF_CONDUCT.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 320f38d2774e..bff2deb0f4c2 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -61,13 +61,16 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at -matplotlib@numfocus.org (monitored by Thomas Caswell and Hannah Aizenman), or -senior NumFOCUS staff at conduct@numfocus.org. +matplotlib@numfocus.org (monitored by Thomas Caswell (\@tacaswell) and Hannah +Aizenman (\@story645)), senior NumFOCUS staff at conduct@numfocus.org, or a +report can be made using the [NumFOCUS Code of Conduct report form][numfocus form]. All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the reporter of any incident. +[numfocus form]: https://numfocus.typeform.com/to/ynjGdT + ## Enforcement Guidelines Community leaders will follow these Community Impact Guidelines in determining From 1021af68e05fee2a4780f7cf7f634f0b3158bed4 Mon Sep 17 00:00:00 2001 From: hannah Date: Tue, 24 Nov 2020 15:19:53 -0500 Subject: [PATCH 5/5] Update CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index bff2deb0f4c2..f049ad177251 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -62,8 +62,8 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at matplotlib@numfocus.org (monitored by Thomas Caswell (\@tacaswell) and Hannah -Aizenman (\@story645)), senior NumFOCUS staff at conduct@numfocus.org, or a -report can be made using the [NumFOCUS Code of Conduct report form][numfocus form]. +Aizenman (\@story645)) or a report can be made using the [NumFOCUS Code of Conduct report form][numfocus form]. +If community leaders cannot come to a resolution about enforcement, reports will be escalated to the NumFocus Code of Conduct committee (conduct@numfocus.org). All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the