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.

Sign up for GitHub

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

Jump to bottom

Added code of conduct in Readme.md #1640

Merged
merged 12 commits into from
Jun 22, 2023
Merged

Added code of conduct in Readme.md #1640

merged 12 commits into from
Jun 22, 2023

Conversation

shloka-gupta
Copy link
Contributor

@shloka-gupta shloka-gupta commented Mar 25, 2022 •
edited
Loading

This issue closes #1346

PR Checklist:

  • make all edits to the docs in the src directory, not in docs or in the html files
  • note any issues closed by this PR with closing keywords
  • put any other relevant information below

@shloka-gupta shloka-gupta requested a review from a team as a code owner March 25, 2022 18:29
@shloka-gupta
Copy link
Contributor Author

Hi, @beckermr and @kathatherine could you please review this PR and let me know if there are any required changes? Thanks! :)

@beckermr
Copy link
Member

We likely want a brief summary of the CoC here. There is a short version on the numfocus website. Maybe we can add that?

@shloka-gupta
Copy link
Contributor Author

@beckermr on it!

ngam
ngam reviewed Mar 25, 2022
View reviewed changes
README.md Outdated

Thank you for helping make this a welcoming, friendly community for all.

Note: Conda-forge adheres to [NumFOCUS Code of Conduct.](https://numfocus.org/code-of-conduct)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Note: Conda-forge adheres to [NumFOCUS Code of Conduct.](https://numfocus.org/code-of-conduct)
We at conda-forge adhere to the [NumFOCUS Code of Conduct.](https://numfocus.org/code-of-conduct)

very minor, but always better to phrase things as humans rather than abstract entities, so we at conda-forge adhere to the CoC, rather than "conda-forge" as an abstract entity (presumably encompassing more than the people, like the bots, etc.) adhering to it

@ngam
Copy link
Contributor

ngam commented Mar 25, 2022

Thank you so much for this!!

I would like to encourage you to add a very brief statement about the consequence of violating our CoC. I believe there is something about that in the docs; basically, repeated violations will lead to a ban.

@shloka-gupta
Copy link
Contributor Author

Hi, @ngam that does make it more friendly and welcoming in nature! Thanks! :)

@ngam and @beckermr could you let me know if I could better the current PR?

@shloka-gupta
Copy link
Contributor Author

shloka-gupta commented Mar 25, 2022 •
edited
Loading

@ngam I came across the Reporting guidelines i.e https://numfocus.org/code-of-conduct#reporting-guidelines
and 'Enforcement: What Happens After a Report is Filed?' i.e https://numfocus.org/code-of-conduct#enforcement

Shall I add both? Or do you think the Reporting guidelines are enough?

cc: @kathatherine @beckermr

@shloka-gupta shloka-gupta removed the request for review from a team March 25, 2022 19:29
@beckermr
Copy link
Member

Please do not bump all of core on these PRs.

@shloka-gupta
Copy link
Contributor Author

Sorry, @beckermr I didn't mean to.

I believe it is auto-mated like over here #1471 and here- #1620

@beckermr
Copy link
Member

ah no worries!

@ngam
Copy link
Contributor

ngam commented Mar 25, 2022

Please do not bump all of core on these PRs.

I believe it is auto-mated like over here #1471 and here- #1620

Yes, it is automated because of this line:

conda-forge.github.io/.github/CODEOWNERS

Line 1 in 5132c8d

* @conda-forge/core

@ngam
Copy link
Contributor

ngam commented Mar 25, 2022

Shall I add both? Or do you think the Reporting guidelines are enough?

Yes, please, that's a good idea!

@shloka-gupta
Copy link
Contributor Author

Added the above.

Shall I make Reporting guidelines as sub-headings instead? Or is this okay?

@ngam
Copy link
Contributor

ngam commented Mar 26, 2022

I think this looks good! It makes it more prominent if they have their own subheading. Maybe @beckermr has more thoughts?

beckermr
beckermr reviewed Mar 26, 2022
View reviewed changes
README.md Outdated

## Enforcement: What Happens After a Report is Filed?

conda-forge and/or our event staff will attempt to ensure your safety and help with any immediate needs, particularly at an in-person event. NumFOCUS will make every effort to acknowledge receipt within 24 hours (and we’ll aim for much more quickly than that). Have a look at the process of [What Happens After a Report is Filed?](https://numfocus.org/code-of-conduct#enforcement).
Copy link
Member

Choose a reason for hiding this comment

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

We cannot speak for numfocus here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah! My bad! Fixed it!

beckermr
beckermr reviewed Mar 26, 2022
View reviewed changes
README.md Outdated Show resolved Hide resolved
@shloka-gupta
Copy link
Contributor Author

Added a small fix as well. Although it isn't concerned with the targeted issue. Fixed the link of dev meeting minutes

@leofang leofang mentioned this pull request Mar 26, 2022
Closed
@shloka-gupta
Copy link
Contributor Author

@beckermr updated as suggested!

kathatherine
kathatherine suggested changes Mar 30, 2022
View reviewed changes
Copy link
Contributor

@kathatherine kathatherine 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 except for those two comments.

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@shloka-gupta
Copy link
Contributor Author

@kathatherine will fix it. Thanks.

Also,

I am a little concerned though and may have messed up a little. I have copied and pasted the wordings of NumFocus directly into the sections since we adhere to them. Shall I modify the wordings of other sections as well or let it be?

@kathatherine
Copy link
Contributor

@chicken-biryani You should be fine quoting NumFocus's code of conduct directly, I've learned. They actually have a template others can follow: https://github.com/numfocus/numfocus/blob/master/manual/numfocus-coc.md

Your additions look good to me.

This was referenced Jun 22, 2023
Closed
Closed
Closed
Closed
jaimergp
jaimergp reviewed Jun 22, 2023
View reviewed changes
README.md Outdated Show resolved Hide resolved
jaimergp
jaimergp approved these changes Jun 22, 2023
View reviewed changes
Copy link
Member

@jaimergp jaimergp left a comment

Choose a reason for hiding this comment

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

LGTM.

Will merge next week unless @conda-forge/core has any further comments.

This was referenced Jun 22, 2023
Closed
Closed
@ocefpaf
Copy link
Member

ocefpaf commented Jun 22, 2023

Will merge next week unless @conda-forge/core has any further comments.

This one slipped through the cracks. Let's merge!

@ocefpaf ocefpaf merged commit f9a2fe4 into conda-forge:main Jun 22, 2023
This was referenced Jun 22, 2023
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ngam ngam ngam left review comments

@kathatherine kathatherine kathatherine requested changes

@ocefpaf ocefpaf ocefpaf approved these changes

@jaimergp jaimergp jaimergp approved these changes

@beckermr beckermr Awaiting requested review from beckermr

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

"Code of Conduct" and "Reporting Guidelines"
6 participants
@shloka-gupta @beckermr @ngam @kathatherine @ocefpaf @jaimergp