Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/iris/src/common_links.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docs/iris/src/whatsnew/latest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +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`)

.. comment
Whatsnew author names (@github name) in alphabetical order. Note that,
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_basic_maths.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down