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.

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

Refresh Code of Conduct from v1.4 to v2.0 #673

Merged
merged 3 commits into from
Nov 3, 2020
Merged

Conversation

weiji14
Copy link
Member

@weiji14 weiji14 commented Oct 25, 2020

Description of proposed changes

Refreshes our code of conduct from v1.4 to v2.0, and also add a Contributor Covenant badge to the main README.md. Community discussion can take place at #672.

Changes (copied from https://github.com/ContributorCovenant/contributor_covenant/blob/29000ea9977e75b76189335f376a42a833972433/changelog#L19-L26):

  • Emphasizes 'community' over 'project' scope, effectively merging the Community Covenant into the Contributor Covenant
  • Adds expectation about accepting responsibility and apologizing to those affected by mistakes, and learning from the experience to the list
  • Adds sexual attention and advances of any kind as unacceptable behavior example
  • Moves enforcement responsibilities from project maintainers to community leaders
  • Adds responsibility to communicate reasons for moderation decisions when removing, editing, or rejecting contributions not aligned to the Code of Conduct
  • Requires community leaders to respect privacy and security of the reporter of any incident, not just confidentiality
  • Provides a template for code of conduct enforcement

The text is copied over from https://www.contributor-covenant.org/version/2/0/code_of_conduct/. Feel free to tweak any of the points if there is anything you feel should be in (or not in) the document.

Fixes #672

Reminders

  • Run make format and make check to make sure the code follows the style guide.
  • Add tests for new features or tests that would have caught the bug that you're fixing.
  • Add new public functions/methods/classes to doc/api/index.rst.
  • Write detailed docstrings for all functions/methods.
  • If adding new functionality, add an example to docstrings or tutorials.

Notes

  • You can write /format in the first line of a comment to lint the code automatically

@weiji14 weiji14 added the documentation Improvements or additions to documentation label Oct 25, 2020
@seisman
Copy link
Member

seisman commented Oct 25, 2020

Looks good to me, but let's hear more from @GenericMappingTools/python @GenericMappingTools/python-contributors

Copy link
Member

@leouieda leouieda left a comment

Choose a reason for hiding this comment

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

Looks great @weiji14! I quite like v2.0, in particular the enforcement guidelines. Gives the CoC a more concrete feeling.

@seisman seisman added this to the 0.2.1 milestone Oct 27, 2020
Copy link
Member

@seisman seisman left a comment

Choose a reason for hiding this comment

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

Looks OK to merge.

@weiji14
Copy link
Member Author

weiji14 commented Oct 29, 2020

Cool! I'll leave it open for a few more days (before v0.2.1 #665 is about to be released) in case anyone else wants to voice their opinion.

@weiji14 weiji14 marked this pull request as ready for review November 3, 2020 23:00
@weiji14 weiji14 merged commit 0c36187 into master Nov 3, 2020
@weiji14 weiji14 deleted the code-of-conduct-2.0 branch November 3, 2020 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Refreshing our Code of Conduct to v2.0
4 participants