Make matplotlib an optional Iris tests dependency #1109
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
lib/iris/tests/__init__.py
Outdated
Member
There was a problem hiding this comment.
@dkillick To tie the _MPL_AVAILABLE even tighter to your try-except block, you could put it in a try-except-else block i.e.
try:
import matplotlib
...
except ImportError:
_MPL_AVAILABLE = False
else:
_MPL_AVAILABLE = True
Just a suggestion, your call ...
Member
Author
|
Turns out I hadn't rebased since #1113 was merged - now done so the Travis build should complete. I've also changed the try-except statements around the matplotlib imports in test scripts to instead use |
lib/iris/tests/test_mapping.py
Outdated
Member
There was a problem hiding this comment.
@dkillick Has this not changed to if tests.MPL_AVAILABLE for a reason ... ?
Member
Author
|
Made the changes as above for the four test modules accidentally missed the first time around... |
Member
|
Excellent, thanks @dkillick 👍 ... could you squash your commit history, then I'll merge. |
Member
Author
|
Squashed. |
bjlittle
added a commit
that referenced
this pull request
May 6, 2014
Make matplotlib an optional Iris tests dependency
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR allows the Iris test suite to successfully run in an environment where matplotlib is not available. This is achieved by adding a new test decorator (
skip_plot) that when used to decorate a test class or function means it will be skipped if matplotlib cannot be imported.To avoid import errors in test modules that use matplotlib (or Iris plotting modules), importing of these modules is wrapped up in a
tryclause.