From 8e1c5b163a1a1f01dd6caad178e19348cd252b41 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Thu, 18 Jun 2020 12:09:18 +0100 Subject: [PATCH 1/3] Replace grib file with netcdf in polar_stereo example. --- docs/iris/example_code/General/polar_stereo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/iris/example_code/General/polar_stereo.py b/docs/iris/example_code/General/polar_stereo.py index ac8c757ed9..bd4a11923d 100644 --- a/docs/iris/example_code/General/polar_stereo.py +++ b/docs/iris/example_code/General/polar_stereo.py @@ -15,7 +15,7 @@ def main(): - file_path = iris.sample_data_path("polar_stereo.grib2") + file_path = iris.sample_data_path("toa_brightness_stereographic.nc") cube = iris.load_cube(file_path) qplt.contourf(cube) ax = plt.gca() From e464083aab18b60d56e1b7b3c3788f2824a6c3d7 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Thu, 18 Jun 2020 12:10:30 +0100 Subject: [PATCH 2/3] Remove iris-grib from Travis testing. --- .travis.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 312914d634..ca47a73388 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,15 +100,6 @@ install: - python setup.py --quiet install - # 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.1, <2"; - conda install --quiet -n ${ENV_NAME} --no-deps iris-grib; - fi - script: # Capture install-dir: As a test command must be last for get Travis to check # the RC, so it's best to start each operation with an absolute cd. From 1a3765b39ada6ffb33acaf92bd73d2d2941f9ba5 Mon Sep 17 00:00:00 2001 From: Patrick Peglar Date: Thu, 25 Jun 2020 17:37:56 +0100 Subject: [PATCH 3/3] New image hash for new version of test_polar_stereo. --- lib/iris/tests/results/imagerepo.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/iris/tests/results/imagerepo.json b/lib/iris/tests/results/imagerepo.json index 884e2b875f..e6a225f022 100644 --- a/lib/iris/tests/results/imagerepo.json +++ b/lib/iris/tests/results/imagerepo.json @@ -108,7 +108,8 @@ ], "example_tests.test_polar_stereo.TestPolarStereo.test_polar_stereo.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/e168317a92d36d89c5bb9e94c55e6f0c9a93c15a6ec584763b21716791de3a81.png", - "https://scitools.github.io/test-iris-imagehash/images/v4/b9e16079971e9e93c8ce0f84c31e3b929f92c0ff3ca1c17e39e03961c07e3f80.png" + "https://scitools.github.io/test-iris-imagehash/images/v4/b9e16079971e9e93c8ce0f84c31e3b929f92c0ff3ca1c17e39e03961c07e3f80.png", + "https://scitools.github.io/test-iris-imagehash/images/v4/ba1e615ec7e097a9961f9cb190f838e091c2c1e73f07c11f6f386b3cc1783e11.png" ], "example_tests.test_polynomial_fit.TestPolynomialFit.test_polynomial_fit.0": [ "https://scitools.github.io/test-iris-imagehash/images/v4/abff4a9df26435886520c97f12414695c4b69d23934bc86adc969237d68ccc6f.png",