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

[MRG] Add a version.py => 2.0 alpha, add khmer@master to requirements.txt #117

Merged
merged 9 commits into from
Apr 10, 2017

Conversation

ctb
Copy link
Contributor

@ctb ctb commented Jan 16, 2017

Relies on sourmash_lib/VERSION to read the version from a single location.

  • Is it mergeable?
  • make test Did it pass the tests?
  • make coverage Is the new code covered?
  • Did it change the command-line interface? Only additions are allowed
    without a major version increment. Changing file formats also requires a
    major version number increment.
  • Was a spellchecker run on the source code and documentation after
    changes were made?

@ctb
Copy link
Contributor Author

ctb commented Jan 16, 2017

Fixes #98 and #110.

@codecov-io
Copy link

codecov-io commented Jan 16, 2017

Codecov Report

Merging #117 into master will increase coverage by 0.03%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #117      +/-   ##
==========================================
+ Coverage   85.34%   85.37%   +0.03%     
==========================================
  Files          13       13              
  Lines        1829     1833       +4     
  Branches       52       52              
==========================================
+ Hits         1561     1565       +4     
  Misses        259      259              
  Partials        9        9
Impacted Files Coverage Δ
sourmash_lib/__init__.py 100% <100%> (ø) ⬆️

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 213e9cb...937f4db. Read the comment docs.

@ctb
Copy link
Contributor Author

ctb commented Jan 17, 2017

Ready for review & maybe merge.

setup.py Outdated
VERSION="1.1"
VERSION='undefined'
with open('sourmash_lib/version.py') as f:
exec(f.read())
Copy link
Member

Choose a reason for hiding this comment

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

Hmmmm, can we use the other alternative from that answer, the one that doesn't need exec()?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the pkg_resources one?

Copy link
Member

Choose a reason for hiding this comment

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

the "Store version string for use during install" one

@ctb ctb changed the title Add a version.py => 2.0 alpha, add khmer@master to requirements.txt [MRG] Add a version.py => 2.0 alpha, add khmer@master to requirements.txt Apr 9, 2017
@ctb
Copy link
Contributor Author

ctb commented Apr 9, 2017

Ready for review!

Copy link
Member

@luizirber luizirber left a comment

Choose a reason for hiding this comment

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

👍

@luizirber luizirber merged commit 9ab2433 into master Apr 10, 2017
@luizirber luizirber deleted the fix/version_and_req branch April 10, 2017 20:01
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.

3 participants