From c9574cbeb2acae320bef136960ac6d632b83c9a1 Mon Sep 17 00:00:00 2001 From: James Penn Date: Wed, 3 Feb 2021 12:02:38 +0000 Subject: [PATCH 1/4] test_incompatible_dimensions used a ragged array for the test, which has been deprecated in numpy, and now fails if dtype is anything other than object. This test appears to be checking that the addition of a [2x4] masked array to a [2x3] masked cube should raise a ValueError. This commit fixes the creation of `data3` object to be a [2x4] non-ragged array. --- lib/iris/tests/test_basic_maths.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/iris/tests/test_basic_maths.py b/lib/iris/tests/test_basic_maths.py index 4b3cde95e4..c4d7b51a06 100644 --- a/lib/iris/tests/test_basic_maths.py +++ b/lib/iris/tests/test_basic_maths.py @@ -853,7 +853,7 @@ def setUp(self): def test_incompatible_dimensions(self): data3 = ma.MaskedArray( - [[3, 3, 3, 4], [2, 2, 2]], mask=[[0, 1, 0, 0], [0, 1, 1]] + [[3, 3, 3, 4], [2, 2, 2, 2]], mask=[[0, 1, 0, 0], [0, 1, 1, 1]] ) with self.assertRaises(ValueError): # Incompatible dimensions. From 3d7ad42795176289518e0b1665fac505c59f0c5f Mon Sep 17 00:00:00 2001 From: James Penn Date: Wed, 3 Feb 2021 13:44:09 +0000 Subject: [PATCH 2/4] Added entry to what's new --- docs/iris/src/whatsnew/latest.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/latest.rst b/docs/iris/src/whatsnew/latest.rst index 3cdf5fe691..1c9c6c4d3d 100644 --- a/docs/iris/src/whatsnew/latest.rst +++ b/docs/iris/src/whatsnew/latest.rst @@ -81,7 +81,7 @@ This document explains the changes made to Iris for this release =========== #. `@rcomer`_ removed an old unused test file. (:pull:`3913`) - +#. `@jamesp`_ updated a test to the latest numpy version (:pull: `3977`) .. comment Whatsnew author names (@github name) in alphabetical order. Note that, From d9547c25d57de8d00a6fc1957d119be870ea5a89 Mon Sep 17 00:00:00 2001 From: James Penn Date: Wed, 3 Feb 2021 13:59:14 +0000 Subject: [PATCH 3/4] Added name to core developer list :) --- docs/iris/src/common_links.inc | 1 + docs/iris/src/whatsnew/latest.rst | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/iris/src/common_links.inc b/docs/iris/src/common_links.inc index 050752a483..9f6a57f529 100644 --- a/docs/iris/src/common_links.inc +++ b/docs/iris/src/common_links.inc @@ -42,6 +42,7 @@ .. _@djkirkham: https://github.com/djkirkham .. _@DPeterK: https://github.com/DPeterK .. _@esc24: https://github.com/esc24 +.. _@jamesp: https://github.com/jamesp .. _@jonseddon: https://github.com/jonseddon .. _@jvegasbsc: https://github.com/jvegasbsc .. _@lbdreyer: https://github.com/lbdreyer diff --git a/docs/iris/src/whatsnew/latest.rst b/docs/iris/src/whatsnew/latest.rst index 1c9c6c4d3d..c5e45ee9c7 100644 --- a/docs/iris/src/whatsnew/latest.rst +++ b/docs/iris/src/whatsnew/latest.rst @@ -81,6 +81,7 @@ This document explains the changes made to Iris for this release =========== #. `@rcomer`_ removed an old unused test file. (:pull:`3913`) + #. `@jamesp`_ updated a test to the latest numpy version (:pull: `3977`) .. comment From 77d60078422598209d47b3203e80fc50fac1ed25 Mon Sep 17 00:00:00 2001 From: James Penn Date: Wed, 3 Feb 2021 14:29:10 +0000 Subject: [PATCH 4/4] Update latest.rst Fixed space in PR macro call --- docs/iris/src/whatsnew/latest.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/latest.rst b/docs/iris/src/whatsnew/latest.rst index c5e45ee9c7..618eeb10d6 100644 --- a/docs/iris/src/whatsnew/latest.rst +++ b/docs/iris/src/whatsnew/latest.rst @@ -82,7 +82,7 @@ This document explains the changes made to Iris for this release #. `@rcomer`_ removed an old unused test file. (:pull:`3913`) -#. `@jamesp`_ updated a test to the latest numpy version (:pull: `3977`) +#. `@jamesp`_ updated a test to the latest numpy version (:pull:`3977`) .. comment Whatsnew author names (@github name) in alphabetical order. Note that,