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

Changelog Update and getting back changes undone to resolve merge conflicts #25

Merged
merged 5 commits into from
Jul 12, 2022

Conversation

ayushanand18
Copy link
Collaborator

@ayushanand18 ayushanand18 commented Jul 10, 2022

Overview of Changes

This pull request tries to resolve #24

With this PR we have got three objectives accomplished:

  • Getting back changes which, we had to undo to resolve merge conflicts in Fix. Tests and MoF improved accessibility #23
  • We have also dropped obisDownload as discussed in the call.
  • Updating the Changelog to v1.0.0, and added description of changes

Notes for reviewers

The tests are passing for this PR with nearly 84% overall coverage and 100% coverage for all modules.

Next Steps

I am now working on Contributing guidelines.

Desc. With this commit I am reverting all the changes I had to undo when resolving merge conflicts.
Desc. Replaced branch name [main] with [master].
Desc. With this commit I have updated the Changelog.rst. + Updated the version to 1.0.0 + Added description of changes
Copy link
Collaborator

@7yl4r 7yl4r 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. Two minor changes:

  • need to update version in init
  • need to update the coveralls badge URL

As a side note: I want to get tests running on PRs too. I think that requires only a small change to tests.yml. (apparently this is working now).

:target: https://github.com/iobis/pyobis/actions/workflows/tests.yml

.. |coverage| image:: https://coveralls.io/repos/sckott/pyobis/badge.svg?branch=master&service=github
:target: https://coveralls.io/github/sckott/pyobis?branch=master
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is pointing to the wrong repo. Need to update the url or remove the coveralls badge.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks @7yl4r for the review! I will update the URL.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I couldn't find a way to update this a coveralls.io badge, maybe we need to register this repo at coveralls.

README.rst Outdated
@@ -118,8 +113,8 @@ Meta
.. |docs| image:: https://readthedocs.org/projects/pyobis/badge/?version=latest
:target: http://pyobis.readthedocs.org/en/latest/?badge=latest

.. |tests| image:: https://github.com/iobis/pyobis/actions/workflows/tests.yml/badge.svg
.. |tests| image:: https://github.com/ayushanand18/pyobis/actions/workflows/tests.yml/badge.svg
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please point all status check to the upstream repo and not your fork.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thank you @ocefpaf for the review! I am sorry I just missed updating this, I was testing whether the badge works or not but forgot to update it later. I'll make the necessary changes.

Desc. I have updated the test status check badge on the README to point the upstream repo-> iobis/pyobis
@7yl4r 7yl4r merged commit d71c81f into iobis:master Jul 12, 2022
@ayushanand18 ayushanand18 deleted the fixmerge branch July 13, 2022 15:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

complete current the 2-part pull-request & get tests working
3 participants