Backport 8c952371 into v1.8.x #1764
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
Member
Author
|
Test failures are the issues due to |
Member
Mmmmm, ideally, yes. We haven't been very good at targeting the maintenance branches recently - I guess we've been optimistic about releasing stuff more (without necessarily doing it). |
Conflicts: lib/iris/tests/unit/fileformats/pp/test_PPField.py
Member
Author
|
OK I pulled in the fixes for the mock failures too so this is passing the test suite now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Addresses #1763 by back-porting 8c95237 into the v1.8.x maintenance branch.
Also back-ports fixes to make the test suite work after updates to mock.