Bump minimal pyparsing to 2.0.1 #8754
Merged
Conversation
This file contains hidden or 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
tacaswell
approved these changes
Jun 13, 2017
dstansby
requested changes
Jun 15, 2017
lib/matplotlib/__init__.py
Outdated
| _python27 = (sys.version_info.major == 2 and sys.version_info.minor >= 7) | ||
| _python34 = (sys.version_info.major == 3 and sys.version_info.minor >= 4) | ||
| if not (_python27 or _python34): | ||
| raise ImportError('matplotlib requires Python 2.7 or 3.4 or later') |
lib/matplotlib/__init__.py
Outdated
| try: | ||
| import dateutil | ||
| except ImportError: | ||
| raise ImportError("matplotlib requires dateutil") |
lib/matplotlib/__init__.py
Outdated
|
|
||
| if not (_python27 or _python34): | ||
| raise ImportError('matplotlib requires Python 2.7 or 3.4 or later') | ||
| "matplotlib requires pyparsing >= 2.0.1") |
5971395 to
6ba12f0
Compare
|
done and made version check warnings consistent. |
dstansby
approved these changes
Jun 15, 2017
QuLogic
reviewed
Jun 15, 2017
lib/matplotlib/__init__.py
Outdated
| if not compare_versions(six.__version__, '1.3'): | ||
| raise ImportError( | ||
| 'six 1.3 or later is required; you have %s' % ( | ||
| six.__version__)) | ||
| "Matplotlib requires six>=1.3; you have %s" % six.__version__) |
There was a problem hiding this comment.
This isn't even true; I always have trouble running Matplotlib through Pycharm's profiler because it has six 1.9.
There was a problem hiding this comment.
Turns out the checked version is 1.10.
There was a problem hiding this comment.
Fixed, but perhaps we should just drop these checks and assume that pip got the dependencies right...
6ba12f0 to
f3cc0c6
Compare
pyparsing is a pure python package so anyone who can install matplotlib 2.1 can realistically also install a recent-ish pyparsing (in fact pip will just pick it up). This avoids having to carry around workarounds for a bunch of old broken versions.
It seems logical to check Python version before modules.
f3cc0c6 to
35ba63e
Compare
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.
pyparsing is a pure python package so anyone who can install matplotlib
2.1 can realistically also install a recent-ish pyparsing (in fact pip
will just pick it up; pyparsing 2.0.1 is from 2013). This avoids having to carry around workarounds
for a bunch of old versions.
Also sneak in some version-check related cleanups, e.g. it makes sense to check python version before modules version.