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

jennaswa · 2023-09-22T13:24:00Z

The CoC Committee has changed the ownership of the reporting form to conduct@mdanalysis.org. This PR points all relevant links to the updated form.

Changes made in this Pull Request:

Remove conduct-mail from CoC and community guidelines section
Point links to new reporting form, which is owned by conduct@mdanalysis.org
Add DEI statement, which was previously only on the website CoC page (I am not sure how to update the TOC. Would someone be able to please do this before merging this PR, or walk me through the appropriate steps?)

PR Checklist

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

Developers certificate of origin

I certify that this contribution is covered by the LGPLv2.1+ license as defined in our LICENSE and adheres to the Developer Certificate of Origin.

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

github-actions · 2023-09-22T13:26:23Z

Linter Bot Results:

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

There are currently no issues detected! 🎉

IAlibay

lgtm

IAlibay · 2023-09-22T13:39:25Z

Actually @jennaswa can you tick that lgplv2 box please?

codecov · 2023-09-22T13:41:18Z

Codecov Report

Patch coverage has no change and project coverage change: -0.02% ⚠️

Comparison is base (8719475) 93.40% compared to head (b38fc07) 93.39%.

❗ Current head b38fc07 differs from pull request most recent head a642099. Consider uploading reports for the commit a642099 to get more accurate results

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #4298      +/-   ##
===========================================
- Coverage    93.40%   93.39%   -0.02%     
===========================================
  Files          170      184      +14     
  Lines        22257    23365    +1108     
  Branches      4071     4071              
===========================================
+ Hits         20790    21822    +1032     
- Misses         951     1026      +75     
- Partials       516      517       +1

see 15 files with indirect coverage changes

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

jennaswa · 2023-09-22T13:42:23Z

Actually @jennaswa can you tick that lgplv2 box please?

Done! Are you able to run the TOC command easily before merging?

IAlibay · 2023-09-22T13:51:38Z

CODE_OF_CONDUCT.md

-welcome reports by
-emailing [*Conduct-email*][conduct-mail] or
-in anonymous by filling out [*this form*][conduct-form].
+welcome reports by filling out [*this form*][conduct-form].


Thinking it through, should this and the other bit about events actually link to the reporting section? That way folks can read the statement about privacy etc..?

This is a good point. I've (hopefully) added links to the Reporting header in the 2 places you mentioned.

Links work great, thanks!

IAlibay · 2023-09-22T13:53:10Z

Ah didn't see the TOC question - unfortunately not until I get to a laptop again sorry:(

jennaswa · 2023-09-22T14:38:26Z

No worries - let's just wait to merge this until someone is able to update the TOC

Add TOC of DEI

lilyminium · 2023-09-22T14:51:41Z

Oops, I was doing stuff quickly and updated your branch directly by accident instead of opening a new PR -- is that what you had in mind @jennaswa?

jennaswa · 2023-09-22T14:53:21Z

Yep, exactly that - thanks, @lilyminium!

IAlibay · 2023-09-22T14:53:49Z

Oops, I was doing stuff quickly and updated your branch directly by accident instead of opening a new PR -- is that what you had in mind @jennaswa?

As long as it was created by markdown-toc-generate-toc it should be fine?

lilyminium · 2023-09-22T15:09:37Z

I did it manually, but viewing the MD file the links work?

IAlibay · 2023-09-22T15:13:22Z

I did it manually, but viewing the MD file the links work?

I assumed there was a reason there being a big "don't change manually" section?

lilyminium · 2023-09-22T15:37:06Z

Sure, at the end of the day it's Markdown and if it works it works IMO. An autogenerated one would probably pick up the subheadings in reporting if you wanted to re-run it though

IAlibay · 2023-09-22T15:42:07Z

Sure, at the end of the day it's Markdown and if it works it works IMO. An autogenerated one would probably pick up the subheadings in reporting if you wanted to re-run it though

If we want to just do it manually from now on that's fine, but in that case please remove the bit asking for folks not to do it manually.

IAlibay · 2023-09-22T16:39:28Z

CODE_OF_CONDUCT.md

@@ -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 -->


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

@tbengtsen

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 conduct@mdanalysis.org) #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 <fiona@mdanalysis.org> Co-authored-by: Oliver Beckstein <orbeckst@mdanalysis.org>

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

a8a6cfb

IAlibay approved these changes Sep 22, 2023

View reviewed changes

IAlibay reviewed Sep 22, 2023

View reviewed changes

Add links to #reporting section

16f62d9

Update CODE_OF_CONDUCT.md

b38fc07

Add TOC of DEI

IAlibay added 2 commits September 22, 2023 17:37

how do you escape an emacs session?

80a4d77

add the empty line back

a642099

IAlibay reviewed Sep 22, 2023

View reviewed changes

IAlibay merged commit f0fb7a0 into MDAnalysis:develop Sep 22, 2023
12 of 20 checks passed

jennaswa mentioned this pull request Sep 25, 2023

Copying updates from main code repository MDAnalysis/MDAnalysis.github.io#326

Merged

IAlibay added the Component-Docs label Sep 25, 2023

IAlibay mentioned this pull request Dec 18, 2023

Fix changelog authors #4372

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

jennaswa commented Sep 22, 2023 •

edited

github-actions bot commented Sep 22, 2023 •

edited

IAlibay left a comment

IAlibay commented Sep 22, 2023

codecov bot commented Sep 22, 2023 •

edited

jennaswa commented Sep 22, 2023

IAlibay Sep 22, 2023

jennaswa Sep 22, 2023

IAlibay Sep 22, 2023

IAlibay commented Sep 22, 2023

jennaswa commented Sep 22, 2023

lilyminium commented Sep 22, 2023

jennaswa commented Sep 22, 2023

IAlibay commented Sep 22, 2023

lilyminium commented Sep 22, 2023

IAlibay commented Sep 22, 2023

lilyminium commented Sep 22, 2023

IAlibay commented Sep 22, 2023

IAlibay Sep 22, 2023

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

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

Conversation

jennaswa commented Sep 22, 2023 • edited

PR Checklist

Developers certificate of origin

github-actions bot commented Sep 22, 2023 • edited

Linter Bot Results:

IAlibay left a comment

Choose a reason for hiding this comment

IAlibay commented Sep 22, 2023

codecov bot commented Sep 22, 2023 • edited

Codecov Report

jennaswa commented Sep 22, 2023

IAlibay Sep 22, 2023

Choose a reason for hiding this comment

jennaswa Sep 22, 2023

Choose a reason for hiding this comment

IAlibay Sep 22, 2023

Choose a reason for hiding this comment

IAlibay commented Sep 22, 2023

jennaswa commented Sep 22, 2023

lilyminium commented Sep 22, 2023

jennaswa commented Sep 22, 2023

IAlibay commented Sep 22, 2023

lilyminium commented Sep 22, 2023

IAlibay commented Sep 22, 2023

lilyminium commented Sep 22, 2023

IAlibay commented Sep 22, 2023

IAlibay Sep 22, 2023

Choose a reason for hiding this comment

jennaswa commented Sep 22, 2023 •

edited

github-actions bot commented Sep 22, 2023 •

edited

codecov bot commented Sep 22, 2023 •

edited