Remove references to SAMPLE_DATA_DIR #2787
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
djkirkham
requested review from
DPeterK,
corinnebosley and
pp-mo
and removed request for
pp-mo
corinnebosley
approved these changes
Oct 11, 2017
Member
corinnebosley
left a comment
corinnebosley
left a comment
There was a problem hiding this comment.
Looks good to me. Pending tests passing, I would be happy to merge.
DPeterK
reviewed
Oct 12, 2017
Member
DPeterK
left a comment
DPeterK
left a comment
There was a problem hiding this comment.
@djkirkham just a small thing from me, otherwise looking good! 👍
lib/iris/__init__.py
Outdated
| "'iris_sample_data' package.") | ||
| warn_deprecated(wmsg) | ||
| target = os.path.join(iris.config.SAMPLE_DATA_DIR, target) | ||
| raise ValueError("Please install the 'iris_sample_data' package to " |
Member
There was a problem hiding this comment.
It's finicky I know, but could this be an ImportError? Seems to make more sense.
You could even then make this a try-except block then.
| class TestIrisSampleDataMissing(tests.IrisTest): | ||
| def test_no_iris_sample_data(self): | ||
| self.patch('iris.iris_sample_data', None) | ||
| with self.assertRaisesRegexp(ValueError, 'Please install'): |
Member
There was a problem hiding this comment.
If you choose to change the error class above you'll need to change it here too.
DPeterK
reviewed
Oct 12, 2017
lib/iris/__init__.py
Outdated
| warn_deprecated(wmsg) | ||
| target = os.path.join(iris.config.SAMPLE_DATA_DIR, target) | ||
| raise ImportError("Please install the 'iris_sample_data' package to " | ||
| "access sample data.") |
Member
There was a problem hiding this comment.
Dah! This line is unindented by just one character but it's causing a whole load of test failures 😢
djkirkham
force-pushed
the
deprecate_sample_data_dir
branch
from
66d2b8d to
dda2af5
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Closes #2654