[FB] launch_ancils: Update merge-base to commit 42a1964#3797
Merged
abooton merged 7 commits intoSciTools:launch_ancils_mergebase42a1964from Aug 20, 2020
Merged
Conversation
* _regrid_area_weighted_array: Tweak variable order to near other use in code (SciTools#3571) * Fix problems with export and echo command. (SciTools#3577) * Pushdocs fix2 (SciTools#3580) * Revert to single-line command for doctr invocation. * Added script comment, partly to force Github respin. * Added whatsnew for Black. (SciTools#3581) * Fixes required due to the release of iris-grib v0.15.0 (SciTools#3582) * Fix python-eccodes pin in travis (SciTools#3593) * Netcdf load of ancillary vars: first working.
* Whatsnews relating to ancillary load + save.
* change dependencies : NOTE these changes need removing when remerging to master
[FB] Launch ancils: reset mergebase to commit 738093f
…pin to imagehash>=4.0 (SciTools#3735) Co-authored-by: Patrick Peglar <patrick.peglar@metoffice.gov.uk>
… launch_ancils * 'launch_ancils' of https://github.com/SciTools/iris: Resolve conflicts with requirements/test.txt to update the imagehash pin to imagehash>=4.0 (SciTools#3735) PI:3358 (WIP) Ensure flags load/save without units (SciTools#3613) PI-3473 Rename "engine.provides" (SciTools#3590) PI-3473: Whatsnews relating to ancillary load + save. (SciTools#3557) PI-3473: Netcdf loading ancillary variables (SciTools#3556) � Conflicts: � lib/iris/fileformats/netcdf.py � lib/iris/tests/unit/fileformats/netcdf/test__load_aux_factory.py � requirements/core.txt
abooton
changed the title
abooton
reviewed
Aug 20, 2020
| @@ -26,8 +26,10 @@ def setUp(self): | |||
| self.ap = mock.MagicMock(units="units") | |||
Contributor
There was a problem hiding this comment.
It is noted that this file conflicted when merged. The resolution is essentially to retain the cube_parts variables in place of provides.
(Is not as a severe conflict than it initially appeared 👍 )
Contributor
|
It is noted that when the feature branch was update, there were conflicts in the following files: |
Contributor
|
I've now replaced the launch_ancils feature branch with the newly updated launch_ancils_mergebase42a1964 branch |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Updating the
launch_ancilsfeature branch to latest master (42a1964)(Merged using the "Commit merge" to preserve the original)
Contributes to #3473