Do not require cython for normal builds #2036
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
…oo old, do not emit error Give RuntimeError if cython is missing and we need it
| @@ -27,15 +27,19 @@ def cython(pyx_files, working_path=''): | |||
| try: | |||
| from Cython import __version__ | |||
| if LooseVersion(__version__) < '0.23': | |||
| raise RuntimeError('Cython >= 0.23 needed to build scikit-image') | |||
| raise ImportError | |||
There was a problem hiding this comment.
Why replace the error with a less informative version?
There was a problem hiding this comment.
It will fall down to the later error if needed.
There was a problem hiding this comment.
I agree with @stefanv You can raise two different messages. Needs a little refactoring.
There was a problem hiding this comment.
👍 from me to revert this change as well.
|
Ping. Is there anything that I need to do here? |
soupault
reviewed
Feb 3, 2017
| c_files = [f.replace('.pyx.in', '.c').replace('.pyx', '.c') for f in pyx_files] | ||
| for cfile in [os.path.join(working_path, f) for f in c_files]: | ||
| if not os.path.isfile(cfile): | ||
| raise RuntimeError('Cython >= 0.23 is required to build scikit-image from git checkout') |
There was a problem hiding this comment.
Could you, please, add a global variable CYTHON_VERSION and make use of it? This will be much easier to maintain.
|
Thanks @opoplawski ! Fixed via #2509. |
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.
Description
We can build without cython when using pypi source tarballs. Let people do that.
Checklist
[It's fine to submit PRs which are a work in progress! But before they are merged, all PRs should provide:]
./doc/examples(new features only)[For detailed information on these and other aspects see scikit-image contribution guidelines]
References
Closes issue #2035