dev

Author: davidhassell

cf/__init__.py

@@ -173,28 +173,27 @@
     )
 
 # Check the version of netCDF4
-_minimum_vn = "1.6.5"
+_minimum_vn = "1.7.2"
 if Version(netCDF4.__version__) < Version(_minimum_vn):
     raise RuntimeError(
         f"Bad netCDF4 version: cf requires netCDF4>={_minimum_vn}. "
         f"Got {netCDF4.__version__} at {netCDF4.__file__}"
     )
 
 # Check the version of cftime
-_minimum_vn = "1.6.2"
+_minimum_vn = "1.6.4"
 if Version(cftime.__version__) < Version(_minimum_vn):
     raise RuntimeError(
         f"Bad cftime version: cf requires cftime>={_minimum_vn}. "
         f"Got {cftime.__version__} at {cftime.__file__}"
     )
 
 # Check the version of numpy
-_minimum_vn = "1.22"
-_maximum_vn = "2.0"
-if not Version(_minimum_vn) <= Version(np.__version__) < Version(_maximum_vn):
+_minimum_vn = "2.0.0"
+if not Version(_minimum_vn) < Version(np.__version__):
     raise ValueError(
-        "Bad numpy version: cf requires _minimum_vn}<=numpy<{_maximum_vn}. "
-        f"Got {np.__version__} at {np.__file__}"
+        "Bad numpy version: cfdm requires {_minimum_vn}<=numpy. "
+        f"Got {Version(np.__version__)} at {np.__file__}"
     )
 
 # Check the version of cfunits

cf/data/collapse/dask_collapse.py

@@ -858,7 +858,6 @@ def cf_sample_size_chunk(x, dtype="i8", computing_meta=False, **kwargs):
         return x
 
     x = cfdm_to_memory(x)
-
     if np.ma.isMA(x):
         N = chunk.sum(np.ones_like(x, dtype=dtype), **kwargs)
     else:

cf/mixin/fielddomain.py

@@ -692,8 +692,7 @@ def _point_not_in_cell(nodes_x, nodes_y, point):
             if ind is not None:
                 mask_component_shape = []
                 masked_subspace_size = 1
-                # TODONUMPY2: https://numpy.org/devdocs/numpy_2_0_migration_guide.html#adapting-to-changes-in-the-copy-keyword
-                ind = np.array(ind, copy=False)
+                ind = np.array(ind)
 
                 for i, (axis, start, stop) in enumerate(
                     zip(canonical_axes, ind.min(axis=1), ind.max(axis=1))

cf/mixin/propertiesdata.py

@@ -49,13 +49,13 @@ class PropertiesData(Properties):
 
     _special_properties = ("units", "calendar")
 
-    def __array__(self, *dtype):
-        """Returns a numpy array representation of the data."""
-        data = self.get_data(None)
-        if data is not None:
-            return data.__array__(*dtype)
-
-        raise ValueError(f"{self.__class__.__name__} has no data")
+#    def __array__(self, *dtype):
+#        """Returns a numpy array representation of the data."""
+#        data = self.get_data(None)
+#        if data is not None:
+#            return data.__array__(*dtype)#
+#
+#        raise ValueError(f"{self.__class__.__name__} has no data")
 
     def __contains__(self, value):
         """Called to implement membership test operators.

cf/test/test_Data.py

@@ -2621,7 +2621,7 @@ def test_Data_percentile_median(self):
                     a1 = np.nanpercentile(filled, q, keepdims=keepdims)
                     mask = np.isnan(a1)
                     if mask.any():
-                        a1 = np.ma.masked_where(mask, a1, copy=False)
+                        a1 = np.ma.masked_where(mask, a1)
 
                     b1 = d.percentile(q, squeeze=not keepdims)
                     self.assertEqual(b1.shape, a1.shape)
@@ -3613,6 +3613,7 @@ def test_Data_sample_size(self):
             b = np.ma.asanyarray(b)
 
             e = d.sample_size(axes=axis, squeeze=True)
+
             e = np.ma.array(e.array)
 
             self.assertTrue((e.mask == b.mask).all())

cf/test/test_Field.py

@@ -2550,7 +2550,7 @@ def test_Field_percentile(self):
         # TODO: add loop to check get same shape and close enough data
         # for every possible axis combo (see also test_Data_percentile).
 
-    def test_Field__aaa_grad_xy(self):
+    def test_Field_grad_xy(self):
         f = cf.example_field(0)
 
         # theta=0 is at the north pole

requirements.txt

@@ -1,12 +1,12 @@
-netCDF4>=1.6.5
-cftime>=1.6.2
-numpy>=1.22,<2.0
+netCDF4>=1.7.2
+cftime>=1.6.4
+numpy>=2.0.0
 cfdm>=1.12.0.0, <1.12.1.0
 psutil>=0.6.0
 cfunits>=3.3.7
 dask>=2024.6.0,<=2024.7.1
 packaging>=20.0
 scipy>=1.10.0
 h5netcdf>=1.3.0
-h5py>=3.10.0
+h5py>=3.12.1
 s3fs>=2024.6.0