Test warnings

lib/iris/tests/integration/test_regridding.py

@@ -112,7 +112,7 @@ def test_nearest(self):
 class TestZonalMean_global(tests.IrisTest):
     def setUp(self):
         np.random.seed(0)
-        self.src = iris.cube.Cube(np.random.random_integers(0, 10, (140, 1)))
+        self.src = iris.cube.Cube(np.random.randint(0, 10, size=(140, 1)))
         s_crs = iris.coord_systems.GeogCS(6371229.0)
         sy_coord = iris.coords.DimCoord(
             np.linspace(-90, 90, 140),

lib/iris/tests/test_cdm.py

@@ -692,7 +692,7 @@ def test_cube_iteration(self):
                 pass
 
     def test_not_iterable(self):
-        self.assertFalse(isinstance(self.t, collections.Iterable))
+        self.assertFalse(isinstance(self.t, collections.abc.Iterable))
 
 
 class Test2dSlicing(TestCube2d):

lib/iris/tests/test_coordsystem.py

@@ -87,7 +87,7 @@ def test_simple(self):
     def test_different_class(self):
         a = self.cs1
         b = self.cs3
-        self.assertNotEquals(a, b)
+        self.assertNotEqual(a, b)
 
     def test_different_public_attributes(self):
         a = self.cs1
@@ -98,15 +98,15 @@ def test_different_public_attributes(self):
         self.assertEqual(a.foo, "a")
 
         # a and b should not be the same
-        self.assertNotEquals(a, b)
+        self.assertNotEqual(a, b)
 
         # a and b should be the same
         b.foo = "a"
         self.assertEqual(a, b)
 
         b.foo = "b"
         # a and b should not be the same
-        self.assertNotEquals(a, b)
+        self.assertNotEqual(a, b)
 
 
 class Test_CoordSystem_xml_element(tests.IrisTest):

lib/iris/tests/test_file_save.py

@@ -201,7 +201,7 @@ def test_bytesio(self):
             data = infile.read()
 
         # Compare files
-        self.assertEquals(
+        self.assertEqual(
             data,
             sio.getvalue(),
             "Mismatch in data when comparing iris bytesio save "

lib/iris/tests/test_util.py

@@ -144,7 +144,7 @@ def test_invalid_clip_lengths(self):
 
     def test_default_values(self):
         # Get the default values specified in the function
-        argspec = inspect.getargspec(iris.util.clip_string)
+        argspec = inspect.getfullargspec(iris.util.clip_string)
         arg_dict = dict(zip(argspec.args[-2:], argspec.defaults))
 
         result = iris.util.clip_string(

lib/iris/tests/unit/analysis/scipy_interpolate/test__RegularGridInterpolator.py

@@ -11,7 +11,7 @@
 import iris.tests as tests  # isort:skip
 
 import numpy as np
-from scipy.sparse.csr import csr_matrix
+from scipy.sparse import csr_matrix
 
 from iris.analysis._scipy_interpolate import _RegularGridInterpolator
 import iris.tests.stock as stock

lib/iris/tests/unit/cube/test_CubeList.py

@@ -565,7 +565,7 @@ def setUp(self):
                 self.scalar_cubes.append(Cube(i, long_name=letter))
 
     def test_iterable(self):
-        self.assertTrue(isinstance(self.scalar_cubes, collections.Iterable))
+        self.assertIsInstance(self.scalar_cubes, collections.abc.Iterable)
 
     def test_iteration(self):
         letters = "abcd" * 5

lib/iris/tests/unit/fileformats/pp/test_PPField.py

@@ -43,7 +43,7 @@
 ]
 
 
-class TestPPField(PPField):
+class DummyPPField(PPField):
 
     HEADER_DEFN = DUMMY_HEADER
     HEADER_DICT = dict(DUMMY_HEADER)
@@ -81,7 +81,7 @@ def test_float64(self):
         # Tests down-casting of >f8 data to >f4.
 
         def field_checksum(data):
-            field = TestPPField()._ready_for_save()
+            field = DummyPPField()._ready_for_save()
             field.data = data
             with self.temp_filename(".pp") as temp_filename:
                 with open(temp_filename, "wb") as pp_file:
@@ -98,7 +98,7 @@ def field_checksum(data):
 
     def test_masked_mdi_value_warning(self):
         # Check that an unmasked MDI value raises a warning.
-        field = TestPPField()._ready_for_save()
+        field = DummyPPField()._ready_for_save()
         field.bmdi = -123.4
         # Make float32 data, as float64 default produces an extra warning.
         field.data = np.ma.masked_array(
@@ -112,7 +112,7 @@ def test_masked_mdi_value_warning(self):
 
     def test_unmasked_mdi_value_warning(self):
         # Check that MDI in *unmasked* data raises a warning.
-        field = TestPPField()._ready_for_save()
+        field = DummyPPField()._ready_for_save()
         field.bmdi = -123.4
         # Make float32 data, as float64 default produces an extra warning.
         field.data = np.array([1.0, field.bmdi, 3.0], dtype=np.float32)
@@ -124,7 +124,7 @@ def test_unmasked_mdi_value_warning(self):
 
     def test_mdi_masked_value_nowarning(self):
         # Check that a *masked* MDI value does not raise a warning.
-        field = TestPPField()._ready_for_save()
+        field = DummyPPField()._ready_for_save()
         field.bmdi = -123.4
         # Make float32 data, as float64 default produces an extra warning.
         field.data = np.ma.masked_array(
@@ -141,24 +141,24 @@ def test_mdi_masked_value_nowarning(self):
 
 class Test_calendar(tests.IrisTest):
     def test_greg(self):
-        field = TestPPField()
+        field = DummyPPField()
         field.lbtim = SplittableInt(1, {"ia": 2, "ib": 1, "ic": 0})
         self.assertEqual(field.calendar, "gregorian")
 
     def test_360(self):
-        field = TestPPField()
+        field = DummyPPField()
         field.lbtim = SplittableInt(2, {"ia": 2, "ib": 1, "ic": 0})
         self.assertEqual(field.calendar, "360_day")
 
     def test_365(self):
-        field = TestPPField()
+        field = DummyPPField()
         field.lbtim = SplittableInt(4, {"ia": 2, "ib": 1, "ic": 0})
         self.assertEqual(field.calendar, "365_day")
 
 
 class Test_coord_system(tests.IrisTest):
     def _check_cs(self, bplat, bplon, rotated):
-        field = TestPPField()
+        field = DummyPPField()
         field.bplat = bplat
         field.bplon = bplon
         with mock.patch(
@@ -203,29 +203,29 @@ def setUp(self):
         self.header = list(header_longs) + list(header_floats)
 
     def test_no_headers(self):
-        field = TestPPField()
+        field = DummyPPField()
         self.assertIsNone(field._raw_header)
         self.assertIsNone(field.raw_lbtim)
         self.assertIsNone(field.raw_lbpack)
 
     def test_lbtim_lookup(self):
-        self.assertEqual(TestPPField.HEADER_DICT["lbtim"], (12,))
+        self.assertEqual(DummyPPField.HEADER_DICT["lbtim"], (12,))
 
     def test_lbpack_lookup(self):
-        self.assertEqual(TestPPField.HEADER_DICT["lbpack"], (20,))
+        self.assertEqual(DummyPPField.HEADER_DICT["lbpack"], (20,))
 
     def test_raw_lbtim(self):
         raw_lbtim = 4321
-        (loc,) = TestPPField.HEADER_DICT["lbtim"]
+        (loc,) = DummyPPField.HEADER_DICT["lbtim"]
         self.header[loc] = raw_lbtim
-        field = TestPPField(header=self.header)
+        field = DummyPPField(header=self.header)
         self.assertEqual(field.raw_lbtim, raw_lbtim)
 
     def test_raw_lbpack(self):
         raw_lbpack = 4321
-        (loc,) = TestPPField.HEADER_DICT["lbpack"]
+        (loc,) = DummyPPField.HEADER_DICT["lbpack"]
         self.header[loc] = raw_lbpack
-        field = TestPPField(header=self.header)
+        field = DummyPPField(header=self.header)
         self.assertEqual(field.raw_lbpack, raw_lbpack)
 
 
@@ -237,39 +237,39 @@ def setUp(self):
 
     def test_attr_singular_long(self):
         lbrow = 1234
-        (loc,) = TestPPField.HEADER_DICT["lbrow"]
+        (loc,) = DummyPPField.HEADER_DICT["lbrow"]
         self.header[loc] = lbrow
-        field = TestPPField(header=self.header)
+        field = DummyPPField(header=self.header)
         self.assertEqual(field.lbrow, lbrow)
 
     def test_attr_multi_long(self):
         lbuser = (100, 101, 102, 103, 104, 105, 106)
-        loc = TestPPField.HEADER_DICT["lbuser"]
+        loc = DummyPPField.HEADER_DICT["lbuser"]
         self.header[loc[0] : loc[-1] + 1] = lbuser
-        field = TestPPField(header=self.header)
+        field = DummyPPField(header=self.header)
         self.assertEqual(field.lbuser, lbuser)
 
     def test_attr_singular_float(self):
         bdatum = 1234
-        (loc,) = TestPPField.HEADER_DICT["bdatum"]
+        (loc,) = DummyPPField.HEADER_DICT["bdatum"]
         self.header[loc] = bdatum
-        field = TestPPField(header=self.header)
+        field = DummyPPField(header=self.header)
         self.assertEqual(field.bdatum, bdatum)
 
     def test_attr_multi_float(self):
         brsvd = (100, 101, 102, 103)
-        loc = TestPPField.HEADER_DICT["brsvd"]
+        loc = DummyPPField.HEADER_DICT["brsvd"]
         start = loc[0]
         stop = loc[-1] + 1
         self.header[start:stop] = brsvd
-        field = TestPPField(header=self.header)
+        field = DummyPPField(header=self.header)
         self.assertEqual(field.brsvd, brsvd)
 
     def test_attr_lbtim(self):
         raw_lbtim = 4321
-        (loc,) = TestPPField.HEADER_DICT["lbtim"]
+        (loc,) = DummyPPField.HEADER_DICT["lbtim"]
         self.header[loc] = raw_lbtim
-        field = TestPPField(header=self.header)
+        field = DummyPPField(header=self.header)
         result = field.lbtim
         self.assertEqual(result, raw_lbtim)
         self.assertIsInstance(result, SplittableInt)
@@ -279,9 +279,9 @@ def test_attr_lbtim(self):
 
     def test_attr_lbpack(self):
         raw_lbpack = 4321
-        (loc,) = TestPPField.HEADER_DICT["lbpack"]
+        (loc,) = DummyPPField.HEADER_DICT["lbpack"]
         self.header[loc] = raw_lbpack
-        field = TestPPField(header=self.header)
+        field = DummyPPField(header=self.header)
         result = field.lbpack
         self.assertEqual(result, raw_lbpack)
         self.assertIsInstance(result, SplittableInt)
@@ -290,7 +290,7 @@ def test_attr_lbpack(self):
         self.assertIsInstance(result, SplittableInt)
 
     def test_attr_raw_lbtim_assign(self):
-        field = TestPPField(header=self.header)
+        field = DummyPPField(header=self.header)
         self.assertEqual(field.raw_lbpack, 0)
         self.assertEqual(field.lbtim, 0)
         raw_lbtim = 4321
@@ -299,7 +299,7 @@ def test_attr_raw_lbtim_assign(self):
         self.assertNotIsInstance(field.raw_lbtim, SplittableInt)
 
     def test_attr_raw_lbpack_assign(self):
-        field = TestPPField(header=self.header)
+        field = DummyPPField(header=self.header)
         self.assertEqual(field.raw_lbpack, 0)
         self.assertEqual(field.lbpack, 0)
         raw_lbpack = 4321
@@ -309,14 +309,14 @@ def test_attr_raw_lbpack_assign(self):
 
     def test_attr_unknown(self):
         with self.assertRaises(AttributeError):
-            TestPPField().x
+            DummyPPField().x
 
 
 class Test_lbtim(tests.IrisTest):
     def test_get_splittable(self):
         headers = [0] * 64
         headers[12] = 12345
-        field = TestPPField(headers)
+        field = DummyPPField(headers)
         self.assertIsInstance(field.lbtim, SplittableInt)
         self.assertEqual(field.lbtim.ia, 123)
         self.assertEqual(field.lbtim.ib, 4)
@@ -325,7 +325,7 @@ def test_get_splittable(self):
     def test_set_int(self):
         headers = [0] * 64
         headers[12] = 12345
-        field = TestPPField(headers)
+        field = DummyPPField(headers)
         field.lbtim = 34567
         self.assertIsInstance(field.lbtim, SplittableInt)
         self.assertEqual(field.lbtim.ia, 345)
@@ -339,7 +339,7 @@ def test_set_splittable(self):
         # arbitrary SplittableInt with crazy named attributes.
         headers = [0] * 64
         headers[12] = 12345
-        field = TestPPField(headers)
+        field = DummyPPField(headers)
         si = SplittableInt(34567, {"foo": 0})
         field.lbtim = si
         self.assertIsInstance(field.lbtim, SplittableInt)