Mergeback v0.17.x back on to main #289
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
* add badges (SciTools#268) * Fix Iris dev guide link (SciTools#267) The Iris dev guide has moved - update the link to the new location * Fix nox when HOME not set * Remove removed Iris util * Revert "Fix nox when HOME not set" This reverts commit 3fddc50. * Actually remove the import * Remove another use of _array_slice_ifempty * Fix visual alignment of continuation * Remove test for removed functionality * Force retest Co-authored-by: Bill Little <bill.james.little@gmail.com>
* Bump version to 0.17.1, update release notes, update iris requirement * Drop py36, add py38 * Fix docs * Remove indentation from docs * Update project classifiers * Bootstrap lockfiles
* add badges (SciTools#268) * Fix Iris dev guide link (SciTools#267) The Iris dev guide has moved - update the link to the new location * Fix nox when HOME not set * Actually remove the import * Remove unused imports * Fix whitespace flagged by Flake8 * Flake8 ignore auto-generated file * Restore imports actually needed * Use raw strings for regex with escapes * Remove unused variables * Remove more unused imports that popped up * No bare 'except' * Reduce line lengths * Flake8 noxfile.py * Include Flake8 in CI * Revert "Fix nox when HOME not set" This reverts commit 3fddc50. Co-authored-by: Bill Little <bill.james.little@gmail.com>
e36d979 to
4d732f9
Compare
Member
Author
|
The CI jobs that are running against iris-main are failing:
|
pp-mo
approved these changes
Mar 4, 2022
Member
pp-mo
left a comment
There was a problem hiding this comment.
Sorry for delay, I finally got there !
Apart from the tiny suggestion, I think this is all just fine.
Just reply something on that + I'll merge.
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.
We forgot to merge the
v.0.17.xfeature branch onto main.Note this is a bit messy due to some changes that have been made to both branches.
Changes to
mainafter we cut thev0.17.xbranch:a) 665df60
b) 99d4344
c) e78018c
Changes to
v0.17.xbranch since it was cut:a) 07fe08a
b) 7d84c18
c) 758da19 - this commit is the main source of confusion as it contains (a) and (b) from the above list ("Changes to
mainafter we cut thev0.17.xbranch"). It also contains some of the changes included in commit (c)d) 3618908
e) 731be65
The main source of conflict was to do with .cirrus.yml and noxfile.py as they had slightly diverged on each branch, but I have hopefully resolved the outstanding issues