Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes required due to the release of iris-grib v0.15.0 #3582

Merged
merged 2 commits into from
Dec 6, 2019

Conversation

lbdreyer
Copy link
Member

@lbdreyer lbdreyer commented Dec 4, 2019

Iris-grib v0.15.0 will be released imminently...

Once it is on conda-forge, it will break the iris-tests due to the inclusion of the new "GRIB_PARAM" cube attribute (which is like a stash attribute but for GRIB files rather than ff/pp.

This PR includes:

  • the tests fixes that are required as a result of GRIB_PARAM
  • removing the test skipper we had been using to skip the 3 test that were waiting on an iris-grib release before they would pass again

Note in the second commit I have included a temporary change that install iris-grib from master (this is to prove the 3 tests from above are passing so we can happily cut the release). Once iris-grib is in conda-forge I will remove this commit, and replace it with a new commit that puts iris-grib in the requirements file (not in travis.yml).

@lbdreyer lbdreyer added this to the v3.0.0 milestone Dec 4, 2019
@lbdreyer lbdreyer changed the title Fixes required for the release of iris-grib v0.15.0 Fixes required due to the release of iris-grib v0.15.0 Dec 4, 2019
@lbdreyer lbdreyer force-pushed the iris_grib_release_check branch from 000d3f5 to b0f342b Compare December 5, 2019 17:38
@lbdreyer lbdreyer force-pushed the iris_grib_release_check branch from b0f342b to 94e6914 Compare December 5, 2019 17:42
@lbdreyer
Copy link
Member Author

lbdreyer commented Dec 6, 2019

Tests are failing as I've added a circular dependency.

iris-grib has a dependency on iris so installs the only iris available on conda-forge which is 2.2.0. It's a bit odd; I would have thought, since we install iris into the environment, it would use my branch of iris rather than the one it originally got from conda-forge

I'll push up a commit to fix this shortly

@lbdreyer lbdreyer force-pushed the iris_grib_release_check branch from 94e6914 to f39728f Compare December 6, 2019 10:16
@lbdreyer
Copy link
Member Author

lbdreyer commented Dec 6, 2019

@bjlittle Tests have been fixed now :)
Could you have a look?

@lbdreyer lbdreyer requested a review from bjlittle December 6, 2019 11:42
@@ -1,31 +0,0 @@
<?xml version="1.0" ?>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the test that produced this result file was removed a long time ago. It just so happened that I deleted all the results files in this directory when I was creating the new result files with "IRIS_TEST_CREATE_MISSING"

I have noticed there are a lot of files like this: result files where the tests that use them have been removed

But no harm in removing this now?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lbdreyer Yes please! It'd be great if you could purge this content now.... otherwise it'll fall between the crack, again.

@bjlittle bjlittle self-assigned this Dec 6, 2019
@bjlittle
Copy link
Member

bjlittle commented Dec 6, 2019

iris-grib has a dependency on iris so installs the only iris available on conda-forge which is 2.2.0. It's a bit odd; I would have thought, since we install iris into the environment, it would use my branch of iris rather than the one it originally got from conda-forge

This is why the .travis-ci jumps through a hoop to install iris-grib with --no-deps. Good spot.

That said,

iris/.travis.yml

Lines 103 to 110 in 242a62f

# TODO : remove when iris doesn't do an integration test requiring iris-grib.
# test against the latest version of python-eccodes.
# Conda-forge versioning is out of order (0.9.* is later than 2.12.*).
- >
if [[ "${TEST_MINIMAL}" != true ]]; then
conda install --quiet -n ${ENV_NAME} python-eccodes=0.9.3;
conda install --quiet -n ${ENV_NAME} --no-deps iris-grib;
fi

You could remove the TODO, but unfortunately the stuff-up regarding python-eccode versioning still stands 😢

Copy link
Member

@bjlittle bjlittle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Purge the unused files, and address the TODO comment in .travis-ci and we're good to go 😃

@bjlittle
Copy link
Member

bjlittle commented Dec 6, 2019

@lbdreyer Awesome, thanks! 😄

As agreed, you can purge any unused .cml/results files in a separate PR 👍

@bjlittle bjlittle merged commit 479b2cf into SciTools:master Dec 6, 2019
stephenworsley pushed a commit that referenced this pull request Dec 13, 2019
* _regrid_area_weighted_array: Tweak variable order to near other use in code (#3571)

* Fix problems with export and echo command. (#3577)

* Pushdocs fix2 (#3580)

* Revert to single-line command for doctr invocation.

* Added script comment, partly to force Github respin.

* Added whatsnew for Black. (#3581)

* Fixes required due to the release of iris-grib v0.15.0 (#3582)

* Fix python-eccodes pin in travis (#3593)

* Netcdf load of ancillary vars: first working.
trexfeathers pushed a commit to trexfeathers/iris that referenced this pull request Jan 14, 2020
trexfeathers added a commit that referenced this pull request Jan 16, 2020
* Bump version to 2.4.0rc0.

* unpin mpl (#3468)

* Merge pull request #3301 from bayliffe/fastpercentilemethod_mask_test

Analysis percentile method - update applicability test for fast_percentile_method

* Have Travis test with iris-grib, remove problem tests (#3469)

* 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

* Merge pull request #2608 from cpelley/PICKLEABLE_FORMATS

TEST: Extends #2569 to unpickle

* _regrid_area_weighted_array: Move axes creation over which weights are calculated to before loop (#3519)

* Purge iris.experimental.regrid np<1.7 support (#3539)

* Add NameConstraint with relaxed name loading (#3463)

* _regrid_area_weighted_array:  move indices variable nearer to use (#3564)

* _regrid_area_weighted_array: Tweak variable order to near other use in code (#3571)

* Fix problems with export and echo command. (#3577)

* Pushdocs fix2 (#3580)

* Revert to single-line command for doctr invocation.

* Added script comment, partly to force Github respin.

* Bracketed six.moves and __future__ imports.

* Fixes required due to the release of iris-grib v0.15.0 (#3582)

* Fix python-eccodes pin in travis (#3593)

* PI-2472: Optimise the area weighted regridding routine (#3598)

* PI-2472: Tweak area weighting regrid move xdim and ydim axes (#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 (#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 (#3596)

* _regrid_area_weighted_array: Refactor weights and move averaging outside loop

* Pin pillow to make graphics tests work again. (#3630)

* PI-2472: Area weighted regridding (#3623)

* 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.

* pep8 conformance.

* pep8 compliance.

* Allow some 'key=None' args in Geostationary creation. (#3628)

LGTM

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

* Integration test loading netcdf geostationary without offset properties.

* pep8 conformance.

* pep8 conformance.

* pep8 conformance.

* test_NameConstraint get mock from iris.tests.

* Remove use of super() in _constraints.py for Py2 compatibility.

* Updated license headers.

* Updated iris-grib reference in extensions.txt.

* Py2 support for iris-grib in Travis.

* Updates for auto docs for Iris 2.4 release.

* What's new entry to unpinning mpl.

* Edited Py2 support for iris-grib in Travis.

* Renamed whatsnew contributions folder for v2.4.

* Hacked tests.integration.test_grib2 to avoid import error from iris-grib version < 0.15.

* Only test grib with python 3.

* Compiled v2.4 whatsnew.

Co-authored-by: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>
Co-authored-by: Bill Little <bill.little@metoffice.gov.uk>
Co-authored-by: stephenworsley <49274989+stephenworsley@users.noreply.github.com>
Co-authored-by: abooton <anna.booton@metoffice.gov.uk>
Co-authored-by: lbdreyer <lbdreyer@users.noreply.github.com>
Co-authored-by: Emma Hogan <ehogan@users.noreply.github.com>
abooton pushed a commit to abooton/iris that referenced this pull request Jun 5, 2020
* _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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants