The Wayback Machine - https://web.archive.org/web/20210914105903/https://github.com/scikit-learn/scikit-learn/pull/18188
Skip to content

/ scikit-learn Public

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

Jump to bottom

DOC minor improvements in CODE_OF_CONDUCT.md file #18188

Merged
merged 3 commits into from Aug 25, 2020
Merged

DOC minor improvements in CODE_OF_CONDUCT.md file #18188

merged 3 commits into from Aug 25, 2020

Conversation

@avinash-ak
Copy link
Contributor

@avinash-ak avinash-ak commented Aug 18, 2020

Reference Issues/PRs

What does this implement/fix? Explain your changes.

Any other comments?
@avinash-ak
Grammatically updated CODE_OF_CONDUCT.md file
a4fa93c
@avinash-ak avinash-ak changed the title Grammatically updated CODE_OF_CONDUCT.md file Doc minor improvements in CODE_OF_CONDUCT.md file Aug 18, 2020
@avinash-ak avinash-ak changed the title Doc minor improvements in CODE_OF_CONDUCT.md file DOC minor improvements in CODE_OF_CONDUCT.md file Aug 18, 2020
@thomasjpfan
thomasjpfan reviewed Aug 18, 2020
View changes
Copy link
Member

@thomasjpfan thomasjpfan left a comment

Thank you for the PR @avinash-ak !
CODE_OF_CONDUCT.md Outdated Show resolved Hide resolved
@jnothman
jnothman reviewed Aug 19, 2020
View changes
CODE_OF_CONDUCT.md Outdated
@@ -1,13 +1,13 @@
# Code of Conduct

We are a community based on openness and friendly, didactic, discussions.
We are a community based on openness, friendly, and didactic discussions.

This comment has been minimized.

Sign in to view
@jnothman

jnothman Aug 19, 2020
Member

I don't think this retains the same meaning

This comment has been minimized.

Sign in to view
@avinash-ak

avinash-ak Aug 19, 2020
Author Contributor

Hi @jnothman thanks for the review. Could you please suggest the modifications.

This comment has been minimized.

Sign in to view
@NicolasHug

NicolasHug Aug 19, 2020
Member

We are a community based on openness, as well as friendly and didactic discussions.

Or the original sentence.

@jnothman
Copy link
Member

@jnothman jnothman commented Aug 19, 2020

I prefer the original to the changes in this pr

@avinash-ak
Copy link
Contributor Author

@avinash-ak avinash-ak commented Aug 19, 2020

shall i close the PR @jnothman

@glemaitre
Copy link
Contributor

@glemaitre glemaitre commented Aug 19, 2020

I am fine with the current code of conduct.

@avinash-ak
Copy link
Contributor Author

@avinash-ak avinash-ak commented Aug 19, 2020

Hi @glemaitre which one the modified one or the old one

@NicolasHug
Copy link
Member

@NicolasHug NicolasHug commented Aug 19, 2020

Thanks for the PR @avinash-ak

just out of curiosity, is your contribution part of a course that requires students to contribute to OSS?

@avinash-ak
Copy link
Contributor Author

@avinash-ak avinash-ak commented Aug 19, 2020

Hi @NicolasHug no it is not part of the course. I am interested in contributing to OSS. Thank you for the response.
Could you please let me know what are the modifications i need make in this PR?

@NicolasHug
Copy link
Member

@NicolasHug NicolasHug commented Aug 19, 2020

ok, thanks. I commented here: #18188 (comment)

@avinash-ak
Update CODE_OF_CONDUCT.md
fef9d59
@avinash-ak
Copy link
Contributor Author

@avinash-ak avinash-ak commented Aug 19, 2020

I have made the changes @NicolasHug

@NicolasHug
NicolasHug approved these changes Aug 19, 2020
View changes
Copy link
Member

@NicolasHug NicolasHug left a comment

thanks @avinash-ak , LGTM!
@avinash-ak
Copy link
Contributor Author

@avinash-ak avinash-ak commented Aug 19, 2020

That's awesome thank you for the suggestions @NicolasHug . If it is fine could you please merge the PR. Thanks Nicolas :)

@Ayush-Parhi
Ayush-Parhi approved these changes Aug 21, 2020
View changes
@rth
rth reviewed Aug 21, 2020
View changes
CODE_OF_CONDUCT.md Outdated

We aspire to treat everybody equally, and value their contributions.

Decisions are made based on technical merit and consensus.

Code is not the only way to help the project. Reviewing pull requests,
answering questions to help others on mailing lists or issues, organizing and
answering questions to help peers on mailing lists or issues, organizing and

This comment has been minimized.

Sign in to view
@rth

rth Aug 21, 2020
Member

I'm not sure the word "peers" is right here, I think the previous version with "others" was more general and was fine.

You take two random people who may one day use scikit-learn for any reason, they wouldn't necessarily consider each other as peers.

This comment has been minimized.

Sign in to view
@avinash-ak

avinash-ak Aug 21, 2020
Author Contributor

Agree @rth thank you. Let me revert the changes

This comment has been minimized.

Sign in to view
@avinash-ak

avinash-ak Aug 21, 2020
Author Contributor

Hi @rth i have reverted the changes. if it is fine could you please merge it :) Thanks Roman.

@avinash-ak
Update CODE_OF_CONDUCT.md
97fa523
@thomasjpfan
thomasjpfan approved these changes Aug 22, 2020
View changes
Copy link
Member

@thomasjpfan thomasjpfan left a comment

I think the current version in this PR is slightly clearer than master:

We are a community based on openness, as well as friendly and didactic discussions.
@avinash-ak
Copy link
Contributor Author

@avinash-ak avinash-ak commented Aug 22, 2020

Thank you @thomasjpfan if it is fine. Could you please merge the PR

@rth rth merged commit 55e1bac into scikit-learn:master Aug 25, 2020
21 checks passed
21 checks passed
@lgtm-com
LGTM analysis: C/C++ No code changes detected
Details
@lgtm-com
LGTM analysis: JavaScript No code changes detected
Details
@lgtm-com
LGTM analysis: Python No code changes detected
Details
ci/circleci: deploy Your tests passed on CircleCI!
Details
ci/circleci: doc Your tests passed on CircleCI!
Details
@circleci-artifacts-redirector
ci/circleci: doc artifact Link to 0/doc/_changed.html
Details
ci/circleci: doc-min-dependencies Your tests passed on CircleCI!
Details
ci/circleci: lint Your tests passed on CircleCI!
Details
@codecov
codecov/patch Coverage not affected when comparing d5ae541...97fa523
Details
@codecov
codecov/project 98.10% (+0.00%) compared to d5ae541
Details
@azure-pipelines
scikit-learn.scikit-learn Build #20200821.22 succeeded
Details
@azure-pipelines
scikit-learn.scikit-learn (Linting) Linting succeeded
Details
@azure-pipelines
scikit-learn.scikit-learn (Linux py36_conda_openblas) Linux py36_conda_openblas succeeded
Details
@azure-pipelines
scikit-learn.scikit-learn (Linux py36_ubuntu_atlas) Linux py36_ubuntu_atlas succeeded
Details
@azure-pipelines
scikit-learn.scikit-learn (Linux pylatest_pip_openblas_pandas) Linux pylatest_pip_openblas_pandas succeeded
Details
@azure-pipelines
scikit-learn.scikit-learn (Linux32 py36_ubuntu_atlas_32bit) Linux32 py36_ubuntu_atlas_32bit succeeded
Details
@azure-pipelines
scikit-learn.scikit-learn (Linux_Runs pylatest_conda_mkl) Linux_Runs pylatest_conda_mkl succeeded
Details
@azure-pipelines
scikit-learn.scikit-learn (Windows py36_pip_openblas_32bit) Windows py36_pip_openblas_32bit succeeded
Details
@azure-pipelines
scikit-learn.scikit-learn (Windows py37_conda_mkl) Windows py37_conda_mkl succeeded
Details
@azure-pipelines
scikit-learn.scikit-learn (macOS pylatest_conda_mkl) macOS pylatest_conda_mkl succeeded
Details
@azure-pipelines
scikit-learn.scikit-learn (macOS pylatest_conda_mkl_no_openmp) macOS pylatest_conda_mkl_no_openmp succeeded
Details
jayzed82 added a commit to jayzed82/scikit-learn that referenced this pull request Oct 22, 2020
@avinash-ak @jayzed82
DOC minor improvements in CODE_OF_CONDUCT.md file (scikit-learn#18188)
36bee63
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jnothman jnothman

@rth rth

@NicolasHug NicolasHug

@thomasjpfan thomasjpfan

@Ayush-Parhi Ayush-Parhi

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@avinash-ak @jnothman @glemaitre @NicolasHug @rth @thomasjpfan @Ayush-Parhi