Don't import kiva/_version.py from setup.py #257
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Instead, compile()/exec() to avoid triggering kiva/__init__.py
Current coverage is 52.05% (diff: 100%)@@ master #257 diff @@
==========================================
Files 126 126
Lines 13176 13176
Methods 0 0
Messages 0 0
Branches 1943 1943
==========================================
Hits 6859 6859
Misses 5872 5872
Partials 445 445
|
| raise ImportError("Unable to import git_revision. Try removing " | ||
| "kiva/_version.py and the build directory " | ||
| "before building.") | ||
| git_revision, full_version = read_version_py('kiva/_version.py') |
There was a problem hiding this comment.
Probably need to be careful here:
- cross-platform path construction
- need to ensure that it works if
setup.pyis not in current working dir (ie. base off ofos.dirname(__file__)).
|
I've built the sdist from this branch on both 2.7 and 3.5. It should be good to go, right? |
|
Yep - sorry should have said it LGTM earlier. |
|
Better late than never! 😄 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #254 and #253
six was already in the
__requires__list in enable/init.py.