-
Notifications
You must be signed in to change notification settings - Fork 4
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
Issue 36 readme refactor #61
Conversation
@heycatwonton You have two commits only one has an issue number in it. Also, did you mean to have two separate commits? It is unclear what is different about the second one. Are there not two differet Issues you are addressing? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix the comments as described in my comment
795fa22
to
569ad66
Compare
@vchendrix The first commit was the first draft and was incomplete, and the 2nd commit was the completion of it. Because of that, they are not 2 different issues being addressed since. I wanted to squash the 2 commits which it looks like I was able to do, but then 2 previous commits (Documentation: Contact Us and changes relative urls...) were also committed along with it - they are both old commits from a previous branch. I am not sure why this happened. How can I remove those 2 commit that are not supposed to be there? |
@heycatwonton it is hard for me to say why those commits are there. When squashing you can choose to remove the commits completely by deleting the lines on rebase |
@vchendrix I did git rebase -i HEAD~2, which showed me the last 2 commits, both for this branch. I picked the 1st one and squashed the 2nd one. I edited the commit msg and then git push -f. |
569ad66
to
33d501d
Compare
Adds changelog to README and Sphinx documentation. Adds contributing to README, edits install instructions. Adds copyright and license to documentation. Renames api.rst and models.rst files. Changes basin3d-core to basin3d reference in documentation. Changes setup.py. Moves items around in table of contents. Closes #36, #35, #20
33d501d
to
ade753a
Compare
@vchendrix I was able to fix this with the help with Danielle! The local branch was not synced with latest release, in this branch I did a |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One specific change requested in setup.py.
One issue for which I can't figure out the source. I could successfully generate the documentation. On the main page, when I click "Key Functions", I am taken to the old api page and the breadcrumbs in the upper left of the doc goes back to "basin3d-core 0.0.1 > api". Perhaps a "core" reference is still lingering somewhere??
author='Val Hendrix, <list all authors>', | ||
author_email='vchendrix@lbl.gov, <list all author emails>', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add the actual authors and their emails here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will make those changes and look for where that 'basin3d-core 0.0.1' could be
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dschristianson which page(s) did you open where you see basin3d-core 0.0.1?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adds changelog to README and Sphinx documentation. Adds contributing to README, edits install instructions. Adds copyright and license to documentation. Renames api.rst and models.rst files. Changes basin3d-core to basin3d reference in documentation. Changes setup.py. Moves items around in table of contents.
Closes #36. References and closes #35, #20
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Test Configuration
PR Self Evaluation
strikethrough things that don’t make sense for your PR
I have commented my code, particularly in hard-to-understand areasI have added tests or modified existing tests that prove my fix is effective or that my feature worksAny dependent changes have been merged and published in the appropriate modules