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

Docs/616 contributing #633

Merged
merged 7 commits into from
Jul 21, 2020
Merged

Docs/616 contributing #633

merged 7 commits into from
Jul 21, 2020

Conversation

ClaudiaComito
Copy link
Contributor

@ClaudiaComito ClaudiaComito commented Jul 16, 2020

Description

Update to contribution guidelines.

Issue/s resolved: #616

Changes proposed:

  • Added intro with most important info and link to Mattermost
  • Few edits in the standard guidelines
  • Added link to upcoming documentation_howto.rst, this link currently points to the 504-docstring-formatting branch, must be updated once that is merged.

Type of change

  • Documentation update

Due Diligence

  • Documentation updated (if needed)
  • Updated changelog.md under the title "Pending Additions"

Does this change modify the behaviour of other functions? If so, which?

no

@ClaudiaComito ClaudiaComito added the documentation Anything related to documentation label Jul 16, 2020
contributing.md Outdated
@@ -43,7 +50,8 @@ git pull upstream master
git checkout -b features/123-boolean-operators
```

* Commit locally as you progress (`git add` and `git commit`) Use a properly formatted commit message, write tests that fail before your change and pass afterward, run all the tests locally and in parallel for different process counts (`mpirun -np <PROCESSES>`). Be sure to document any changed behavior in docstrings, keeping to HeAT's docstring standard (explained below).
* Commit locally as you progress (`git add` and `git commit`) Use a properly formatted commit message, write tests that fail before your change and pass afterward, run all the tests locally and in parallel for different process counts (`mpirun -np <PROCESSES>`). Be sure to document any changed behavior in docstrings, keeping to HeAT's [docstring standard](https://github.com/helmholtz-analytics/heat/blob/504-docstring-formatting/doc/source/documentation_howto.rst).
Copy link
Member

Choose a reason for hiding this comment

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

The link to the docstrings branch is somewhat unfortunate. Should have this as a TODO in 504 to let it point to master

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed.

@@ -55,9 +63,9 @@ git push origin features/123-boolean-operators

* Enter your GitHub username and password (advanced users can remove this step by connecting to GitHub with SSH.

* Go to GitHub. The new branch will show up with a green Pull Request button. Make sure the title and message are clear, concise, and self- explanatory. Then click the button to submit it.
* Go to GitHub. The new branch will show up with a green Pull Request button. Make sure the title and message are clear, concise, and self-explanatory. Then click the button to submit it.
Copy link
Member

Choose a reason for hiding this comment

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

Perhaps a statement on rebasing 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.

Hmm. Thanks for reminding me (to rebase).

Do we know what we want well enough to write it down in the guidelines? Do we want to ask the contributors to tidy up their commits only keeping the most important ones (git rebase -i master and then, in most cases, force push), or do we want to rebase by default before every PR? We haven't been sticking to any particular rule so far...

Copy link
Member

Choose a reason for hiding this comment

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

They should rebase before the PR. After the PR is live, no more rebasing. Moreover, should we make a general reference with link towards our development process (what is it now btw Github Flow or Gitlab Flow?)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think we have reached an agreement on this. I would leave it all out for now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've mentioned rebasing before pushing as we discussed offline.

@codecov
Copy link

codecov bot commented Jul 16, 2020

Codecov Report

Merging #633 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #633   +/-   ##
=======================================
  Coverage   97.40%   97.40%           
=======================================
  Files          79       79           
  Lines       16126    16126           
=======================================
  Hits        15708    15708           
  Misses        418      418           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d13e354...090479a. Read the comment docs.

@ClaudiaComito ClaudiaComito force-pushed the docs/616-contributing branch from 2d5b561 to 2ababcf Compare July 16, 2020 10:07
Copy link
Contributor

@Cdebus Cdebus left a comment

Choose a reason for hiding this comment

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

Looks good, just 2-3 minor things

contributing.md Outdated
@@ -1,6 +1,13 @@
## Contributing to HeAT

*These contribution guidelines are inspired by NumPy's contribution guidelines of the SciPy community.*
Thanks for your interest in contributing to HeAT!
Copy link
Contributor

Choose a reason for hiding this comment

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

"Thank you"....
And maybe add something: "We appreciate your effort" ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

contributing.md Outdated
@@ -43,7 +50,8 @@ git pull upstream master
git checkout -b features/123-boolean-operators
```

* Commit locally as you progress (`git add` and `git commit`) Use a properly formatted commit message, write tests that fail before your change and pass afterward, run all the tests locally and in parallel for different process counts (`mpirun -np <PROCESSES>`). Be sure to document any changed behavior in docstrings, keeping to HeAT's docstring standard (explained below).
* Commit locally as you progress (`git add` and `git commit`) Use a properly formatted commit message, write tests that fail before your change and pass afterward, run all the tests locally and in parallel for different process counts (`mpirun -np <PROCESSES>`). Be sure to document any changed behavior in docstrings, keeping to HeAT's [docstring standard](https://github.com/helmholtz-analytics/heat/blob/504-docstring-formatting/doc/source/documentation_howto.rst).
Copy link
Contributor

Choose a reason for hiding this comment

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

Dot missing after (git add and git commit) ... as in end of sentence

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch! Done

contributing.md Outdated
@@ -43,7 +50,8 @@ git pull upstream master
git checkout -b features/123-boolean-operators
```

* Commit locally as you progress (`git add` and `git commit`) Use a properly formatted commit message, write tests that fail before your change and pass afterward, run all the tests locally and in parallel for different process counts (`mpirun -np <PROCESSES>`). Be sure to document any changed behavior in docstrings, keeping to HeAT's docstring standard (explained below).
* Commit locally as you progress (`git add` and `git commit`) Use a properly formatted commit message, write tests that fail before your change and pass afterward, run all the tests locally and in parallel for different process counts (`mpirun -np <PROCESSES>`). Be sure to document any changed behavior in docstrings, keeping to HeAT's [docstring standard](https://github.com/helmholtz-analytics/heat/blob/504-docstring-formatting/doc/source/documentation_howto.rst).
Copy link
Contributor

Choose a reason for hiding this comment

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

I like the link to the docstrings... can we mention that again further down under "guidelines" ? (line 100 )

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes good idea, done

@ClaudiaComito
Copy link
Contributor Author

@Markus-Goetz @Cdebus I'm unhappy about the pre-commit information being on README. I'm going to move it to contributing.md and have README point to the contribution guidelines, unless somebody screams.

@Markus-Goetz
Copy link
Member

Seems reasonable

@ClaudiaComito
Copy link
Contributor Author

Seems reasonable

I think I'm done. See you next month!

Cdebus
Cdebus previously approved these changes Jul 21, 2020
@Cdebus Cdebus merged commit 6629499 into master Jul 21, 2020
@Cdebus Cdebus deleted the docs/616-contributing branch July 21, 2020 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Anything related to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update contributing.md
3 participants