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

Update CoC according to suggestions from current CoC committee #4289

Merged
merged 7 commits into from
Sep 20, 2023

Conversation

jennaswa
Copy link
Contributor

@jennaswa jennaswa commented Sep 15, 2023

The current CoC committee (@jennaswa, @micaela-matta, and @richardjgowers) met on September 1, 2023 to discuss proposed updates to the MDAnalysis CoC and CoC procedures. This PR reflects the proposed changes agreed upon by the committee and requires approval from all core developers.

Changes made in this Pull Request:

-Remove option to file a report by e-mail
-Edit language throughout to clarify that CoC Committee is responsible for receiving, investigating, and enforcing reports
-Add reporting procedures for events (and acknowledge NumFOCUS for this text)

PR Checklist

  • Tests?
  • Docs?
  • CHANGELOG updated?
  • Issue raised/referenced?

Developers certificate of origin


📚 Documentation preview 📚: https://mdanalysis--4289.org.readthedocs.build/en/4289/

The CoC Committee voted on Sep 1, 2023 to remove the mailing list option. See notes from the meeting leading to this recommendation here: https://docs.google.com/document/d/1TyTOm7Z-769l8BV0v1oncBBETVEqiiQayHqk3dNg7yo/edit?usp=sharing
Instead of including names of CoC Committee members here, it would be best to move names to the Roles & Responsibilities page when it is up (MDAnalysis#300) and provide a link
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Hello there first time contributor! Welcome to the MDAnalysis community! We ask that all contributors abide by our Code of Conduct and that first time contributors introduce themselves on the developer mailing list so we can get to know you. You can learn more about participating here. Please also add yourself to package/AUTHORS as part of this PR.

@github-actions
Copy link

github-actions bot commented Sep 15, 2023

Linter Bot Results:

Hi @jennaswa! Thanks for making this PR. We linted your code and found the following:

There are currently no issues detected! 🎉

@jennaswa
Copy link
Contributor Author

In addition, we propose to set up a [email protected] account, which would be used to change ownership of the reporting form. There are also a few proposed changes to the questions on the reporting form itself to assist with collecting details relevant to an incident. See our google doc on CoCC & Procedures for notes on all proposed changes.

@codecov
Copy link

codecov bot commented Sep 15, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (2197a2c) 93.40% compared to head (914efe3) 93.40%.
Report is 3 commits behind head on develop.

Additional details and impacted files
@@            Coverage Diff             @@
##           develop    #4289     +/-   ##
==========================================
  Coverage    93.40%   93.40%             
==========================================
  Files          170      184     +14     
  Lines        22255    23364   +1109     
  Branches      4071     4071             
==========================================
+ Hits         20788    21824   +1036     
- Misses         951     1024     +73     
  Partials       516      516             

see 15 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@tylerjereddy tylerjereddy left a comment

Choose a reason for hiding this comment

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

LGTM, +1

Copy link
Member

@orbeckst orbeckst left a comment

Choose a reason for hiding this comment

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

I have one comment where I believe the text needs changing.

But overall this is great and I don't want to hold this up. Thanks for your work, CoC Committee!

CODE_OF_CONDUCT.md Outdated Show resolved Hide resolved
Copy link
Member

@IAlibay IAlibay left a comment

Choose a reason for hiding this comment

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

lgtm - apologies for the delay, I thought I had already approved for some reason

Copy link
Member

@lilyminium lilyminium left a comment

Choose a reason for hiding this comment

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

LGTM!

@richardjgowers richardjgowers merged commit 0b9bfd5 into MDAnalysis:develop Sep 20, 2023
20 of 21 checks passed
@jennaswa jennaswa deleted the CoC-proposed_changes branch September 22, 2023 13:11
@IAlibay IAlibay mentioned this pull request Dec 18, 2023
5 tasks
orbeckst added a commit that referenced this pull request Dec 21, 2023
Update of AUTHORS and CHANGELOG with inferred author contributions.

*  Removed duplicate mattwthompson in 0.20.0 changelog entry.: mattwthompson was placed twice by accident, this removes this duplication.

* Addition of missing authors.

   An retrospective analysis of the authors found via `git shortlog -s -n --email --branches="develop"` found several commits by authors which were not present in the `AUTHORS.md` file.

    - Zhenbo Li: commited via PR: Started tests for gnm. #803 and Make Travis run tests on OSX. #771,
    - Jenna M. Swarthout via PR Update CoC according to suggestions from current CoC committee #4289 and Point to new reporting form link (owned by [email protected]) #4298,
    - Bradley Dice via PR   Fix GSD Windows compatibility #2384 ,
    - David Minh via PR #2668

   There seemed to be no indications in the above mentioned PRs that the author did not want to be in the authors file, it looks like it was just forgotten.

* Addition of missing entries from the changelog

   Continued cross referencing of the git shortlog output but also accounting for the changelog identified several individuals that had not been included in the changelog entries for the release they contributed under. They were added to the relevant entry of the changelog based on the merge commit date.

   Please note that for Tone Bengsten, we a) had no github handle (so they were assigned @tbengtsen), and b) no specific commit. Given we know that this individual was including alongside the encore merge, they were assigned to the 0.16.0 release.

* Update CHANGELOG
* PR #1218
* PR #1284 and #1408
* PR #4109
* based on git history
* PRs #803 and #771 (author addition, changelog addition)
* PR #2255 and #2221
* PR #1225
* PR #4289 and #4298
* PR #4031
* PR #4085
* PR #3635
* PR #2356
* PR #2559
* No GH handle - Encore author addition @tbengtsen
* PR #4184
* PR #2614
* PR #2219
* PR #2384
* PR #2668
* Add missing entry for Jenna

Thanks to @fiona-naughton for helping out with digging into this data :)

Co-authored-by: Fiona Naughton <[email protected]>
Co-authored-by: Oliver Beckstein <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants