Skip to content

Define Iris 2.4#3638

Merged
trexfeathers merged 36 commits intoSciTools:v2.4.xfrom
pp-mo:my__v24x2
Jan 16, 2020
Merged

Define Iris 2.4#3638
trexfeathers merged 36 commits intoSciTools:v2.4.xfrom
pp-mo:my__v24x2

Conversation

@pp-mo
Copy link
Member

@pp-mo pp-mo commented Jan 15, 2020 •
edited by trexfeathers
Loading

@pp-mo replacement for #3636, because @trexfeathers is absent today.

I have implicitly accepted the commits from #3636,
and will be completing remaining tasks ..

  • fix remaining grib test failures (since 1148b37)
  • review all commits inherited from Cut v2.4 Features #3636 (i.e, up to 57d82fa), and if needed ...
    • [ ] add further corrections
    • [ ] get additional independent review ?
    • okay to go
  • complete release notes

Next + afterwards (todo on 2.4.x branch) ...

  • fix version string
  • tag RC
  • make release

trexfeathers and others added 30 commits January 13, 2020 13:09
@trexfeathers
Bump version to 2.4.0rc0.
b1f9b84
@bjlittle @pp-mo
unpin mpl (SciTools#3468)
a193229
@bjlittle @pp-mo
Merge pull request SciTools#3301 from bayliffe/fastpercentilemethod_m…
a7407a9 
…ask_test

Analysis percentile method - update applicability test for fast_percentile_method
@stephenworsley @pp-mo
Have Travis test with iris-grib, remove problem tests (SciTools#3469)
fb821a2 
* Have Travis test with iris-grib, remove problem tests

* mock GribInternalError correctly

* Update license headers

* account for changes in handling of grib message defaults

* Test against the latest version of python-eccodes

* Moved irir-grib skip to iris.tests
@bjlittle @pp-mo
Merge pull request SciTools#2608 from cpelley/PICKLEABLE_FORMATS
cc11fb2 
TEST: Extends SciTools#2569 to unpickle
@abooton @pp-mo
_regrid_area_weighted_array: Move axes creation over which weights ar…
5f12b82 
…e calculated to before loop (SciTools#3519)
@bjlittle @pp-mo
Purge iris.experimental.regrid np<1.7 support (SciTools#3539)
b7b3486
@bjlittle @pp-mo
Add NameConstraint with relaxed name loading (SciTools#3463)
32875ed
@abooton @pp-mo
_regrid_area_weighted_array: move indices variable nearer to use (Sci…
d6600e9 
…Tools#3564)
@abooton @pp-mo
_regrid_area_weighted_array: Tweak variable order to near other use i…
85b43d1 
…n code (SciTools#3571)
@trexfeathers @pp-mo
Bracketed six.moves and __future__ imports.
48b7f5f
@pp-mo
Fix problems with export and echo command. (SciTools#3577)
1fe8967
@pp-mo
Pushdocs fix2 (SciTools#3580)
8ea8ae5 
* Revert to single-line command for doctr invocation.

* Added script comment, partly to force Github respin.
@lbdreyer @pp-mo
Fixes required due to the release of iris-grib v0.15.0 (SciTools#3582)
6735245
@lbdreyer @pp-mo
Fix python-eccodes pin in travis (SciTools#3593)
cebfb52
@abooton @pp-mo
PI-2472: Optimise the area weighted regridding routine (SciTools#3598)
89d2330 
* PI-2472: Tweak area weighting regrid move xdim and ydim axes (SciTools#3594)

* _regrid_area_weighted_array: Set axis order to y_dim, x_dim last dimensions

* _regrid_area_weighted_array: Extra tests for axes ordering

* PI-2472: Tweak area weighting regrid enforce xdim ydim (SciTools#3595)

* _regrid_area_weighted_array: Set axis order to y_dim, x_dim last dimensions

* _regrid_area_weighted_array: Extra tests for axes ordering

* _regrid_area_weighted_array: Ensure x_dim and y_dim

* PI-2472: Tweak area weighting regrid move averaging out of loop (SciTools#3596)

* _regrid_area_weighted_array: Refactor weights and move averaging outside loop
@trexfeathers @pp-mo
pep8 conformance.
c64ab80
@pp-mo
Pin pillow to make graphics tests work again. (SciTools#3630)
d98c824
@ehogan @pp-mo
PI-2472: Area weighted regridding (SciTools#3623)
37d207e 
* The Area-weights routine is refactored into the "__prepare" and "__perform" structure, in-line with our other regridding methods.
* The area-weights are now computed in the "__prepare", so are calculated once.
* The information required for checking the regridding weights and target grid info are now cached on the "regridder" object.
* This is inline with the general use already described in the documentation.
@trexfeathers @pp-mo
pep8 compliance.
c2fa8b4
@pp-mo
Allow some 'key=None' args in Geostationary creation. (SciTools#3628)
495e359 
LGTM

* Allow some 'key=None' args in Geostationary creation.

* Integration test loading netcdf geostationary without offset properties.
@trexfeathers @pp-mo
pep8 conformance.
bb5f9ce
@trexfeathers @pp-mo
pep8 conformance.
af405de
@trexfeathers @pp-mo
pep8 conformance.
4622899
@trexfeathers
test_NameConstraint get mock from iris.tests.
a6a965d
@trexfeathers
Remove use of super() in _constraints.py for Py2 compatibility.
2b5f4fa
@trexfeathers
Updated license headers.
bd8896c
@trexfeathers
Updated iris-grib reference in extensions.txt.
d9f9e6f
@trexfeathers
Py2 support for iris-grib in Travis.
43a5eee
@trexfeathers
Updates for auto docs for Iris 2.4 release.
fc6488c
@pp-mo
Copy link
Member Author

pp-mo commented Jan 15, 2020 •
edited
Loading

Grib tests fixing

Problem:
We include above the commit 6735245 "Fixes required due to the release of iris-grib v0.15.0 (#3582)", which is cherry-picked from master : This PR fixed outstanding problems with several Iris grib tests (which had gone stale while grib installation was broken), and also made key changes for compatibility with iris-grib v 0.15.
The problem is that while it "fixes" all the iris grib tests, it also means they now only work with iris-grib >= 0.15 -- which is not compatible with python 2.

So... this all works ok when testing under python3 with iris-grib v0.15
See : all-phases Travis test page

... but when run in python2, against iris-grib 0.14, it introduces a bunch of problems
See : Travis log for initial results in python2
What is notable here :

  1. tests with python3 and iris-grib v0.15 all pass
  2. tests with python2 and iris-grib v0.14 have a bunch of problems :
    a) one test not running because it expects to import iris_grib.GRIBcode (>=0.15 only)
    b) a lot of tests failing because they expect the GRIB_PARAM attribute
    • either explitly in test code
    • or in results files used in a tests.assertCML()

Fixing:
Now added commit 76afe7c "Hacked tests.integration.test_grib2 to avoid import error from iris-grib version < 0.15." to enable iris.tests.integration.test_grib2 to function with iris=grib v.0.14 (in python2 testing).
Re-spun tests ... Travis page showing python2/python3 test results
... shows python3 still working, and python2 problems now reduced to "expected" differences, as checked against changes in iris-grib 0.15, listed in 0.15 release notes.

@pp-mo
Copy link
Member Author

pp-mo commented Jan 15, 2020

Latest commit 1148b37 prevents install of iris-grib in Python 2.
This means all the grib testing is skipped in Python 2, to avoid the known test problems with iris-grib v0.14.

The above comment demonstrates that iris 2.4 does "work" with iris-grib v0.14, though the tests do not all pass for reasons given.
This should be good enough, as we don't expect to develop any further beyond Iris 2.4

@pp-mo
Copy link
Member Author

pp-mo commented Jan 15, 2020

@lbdreyer @trexfeathers
Good to merge now, I hope.
See list of following TODOs above in main PR description -- these to be done in separate PRs I think

@pp-mo pp-mo mentioned this pull request Jan 15, 2020
Closed
@trexfeathers
Copy link
Contributor

trexfeathers commented Jan 16, 2020

Latest commit 1148b37 prevents install of iris-grib in Python 2.
This means all the grib testing is skipped in Python 2, to avoid the known test problems with iris-grib v0.14.
The above comment demonstrates that iris 2.4 does "work" with iris-grib v0.14, though the tests do not all pass for reasons given.
This should be good enough, as we don't expect to develop any further beyond Iris 2.4

Agreed. The tests failed exactly how we would predict them to. No other failures occurred

@trexfeathers trexfeathers merged commit e698d76 into SciTools:v2.4.x Jan 16, 2020
@pp-mo pp-mo deleted the my__v24x2 branch January 16, 2020 12:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Release: Minor

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@pp-mo @trexfeathers @bjlittle @stephenworsley @abooton @lbdreyer @ehogan