Skip to content

Commit c1f1887

Browse files
authored
Update Code of Conduct to v2.1 (#1754)
* Update Code of Conduct to v2.1 * Update the badge in README * List Meghan as a contact
1 parent 2a45c0d commit c1f1887

File tree

2 files changed

+29
-24
lines changed

2 files changed

+29
-24
lines changed

CODE_OF_CONDUCT.md

+28-23
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ We as members, contributors, and leaders pledge to make participation in our
66
community a harassment-free experience for everyone, regardless of age, body
77
size, visible or invisible disability, ethnicity, sex characteristics, gender
88
identity and expression, level of experience, education, socio-economic status,
9-
nationality, personal appearance, race, religion, or sexual identity
10-
and orientation.
9+
nationality, personal appearance, race, caste, color, religion, or sexual
10+
identity and orientation.
1111

1212
We pledge to act and interact in ways that contribute to an open, welcoming,
1313
diverse, inclusive, and healthy community.
@@ -22,17 +22,17 @@ community include:
2222
* Giving and gracefully accepting constructive feedback
2323
* Accepting responsibility and apologizing to those affected by our mistakes,
2424
and learning from the experience
25-
* Focusing on what is best not just for us as individuals, but for the
26-
overall community
25+
* Focusing on what is best not just for us as individuals, but for the overall
26+
community
2727

2828
Examples of unacceptable behavior include:
2929

30-
* The use of sexualized language or imagery, and sexual attention or
31-
advances of any kind
30+
* The use of sexualized language or imagery, and sexual attention or advances of
31+
any kind
3232
* Trolling, insulting or derogatory comments, and personal or political attacks
3333
* Public or private harassment
34-
* Publishing others' private information, such as a physical or email
35-
address, without their explicit permission
34+
* Publishing others' private information, such as a physical or email address,
35+
without their explicit permission
3636
* Other conduct which could reasonably be considered inappropriate in a
3737
professional setting
3838

@@ -61,7 +61,7 @@ representative at an online or offline event.
6161
Instances of abusive, harassing, or otherwise unacceptable behavior may be
6262
reported to the community leaders responsible for enforcement
6363
by contacting [Leonardo Uieda](http://www.leouieda.com) (preferred) or
64-
[Paul Wessel](http://www.soest.hawaii.edu/wessel).
64+
[Meghan Jones](https://www.soest.hawaii.edu/soestwp/about/directory/meghan-jones/).
6565
All complaints will be reviewed and investigated promptly and fairly.
6666

6767
All community leaders are obligated to respect the privacy and security of the
@@ -83,15 +83,15 @@ behavior was inappropriate. A public apology may be requested.
8383

8484
### 2. Warning
8585

86-
**Community Impact**: A violation through a single incident or series
87-
of actions.
86+
**Community Impact**: A violation through a single incident or series of
87+
actions.
8888

8989
**Consequence**: A warning with consequences for continued behavior. No
9090
interaction with the people involved, including unsolicited interaction with
9191
those enforcing the Code of Conduct, for a specified period of time. This
9292
includes avoiding interactions in community spaces as well as external channels
93-
like social media. Violating these terms may lead to a temporary or
94-
permanent ban.
93+
like social media. Violating these terms may lead to a temporary or permanent
94+
ban.
9595

9696
### 3. Temporary Ban
9797

@@ -107,23 +107,28 @@ Violating these terms may lead to a permanent ban.
107107
### 4. Permanent Ban
108108

109109
**Community Impact**: Demonstrating a pattern of violation of community
110-
standards, including sustained inappropriate behavior, harassment of an
110+
standards, including sustained inappropriate behavior, harassment of an
111111
individual, or aggression toward or disparagement of classes of individuals.
112112

113-
**Consequence**: A permanent ban from any sort of public interaction within
114-
the community.
113+
**Consequence**: A permanent ban from any sort of public interaction within the
114+
community.
115115

116116
## Attribution
117117

118118
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
119-
version 2.0, available at
120-
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
119+
version 2.1, available at
120+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
121121

122-
Community Impact Guidelines were inspired by [Mozilla's code of conduct
123-
enforcement ladder](https://github.com/mozilla/diversity).
122+
Community Impact Guidelines were inspired by
123+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
124+
125+
For answers to common questions about this code of conduct, see the FAQ at
126+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
127+
[https://www.contributor-covenant.org/translations][translations].
124128

125129
[homepage]: https://www.contributor-covenant.org
130+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
131+
[Mozilla CoC]: https://github.com/mozilla/diversity
132+
[FAQ]: https://www.contributor-covenant.org/faq
133+
[translations]: https://www.contributor-covenant.org/translations
126134

127-
For answers to common questions about this code of conduct, see the FAQ at
128-
https://www.contributor-covenant.org/faq. Translations are available at
129-
https://www.contributor-covenant.org/translations.

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ PyGMT
3131
.. image:: https://zenodo.org/badge/DOI/10.5281/3781524.svg
3232
:alt: Digital Object Identifier for the Zenodo archive
3333
:target: https://doi.org/10.5281/zenodo.3781524
34-
.. image:: https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg
34+
.. image:: https://img.shields.io/badge/Contributor%20Covenant-v2.1%20adopted-ff69b4.svg
3535
:alt: Contributor Code of Conduct
3636
:target: CODE_OF_CONDUCT.md
3737

0 commit comments

Comments
 (0)