dev

Author: davidhassell

Changelog.rst

@@ -23,8 +23,8 @@ version NEXTVERSION
 * New class `cf.NetCDF4Array`
 * New class `cf.CFAH5netcdfArray`
 * New class `cf.CFANetCDF4Array`
-* Replace core `dask` functionality with that imported from `cfdm`.
-  https://github.com/NCAS-CMS/cf-python/pull/836)
+* Replace core `dask` functionality with that imported from `cfdm`
+  (https://github.com/NCAS-CMS/cf-python/pull/836)
 * Fix bug that sometimes puts an incorrect ``radian-1`` or
   ``radian-2`` in the returned units of the differential operator
   methods and functions

cf/data/data.py

@@ -540,7 +540,7 @@ def diff(self, axis=-1, n=1, inplace=False):
          [1.0 1.5 0.5]]
         >>> print(d.diff(n=2).array)
         [[0.0  0.0]
-         [ --   --]s
+         [ --   --]
          [0.5 -1.0]]
         >>> print(d.diff(axis=0).array)
         [[4.0 3.5 -- 4.0]
@@ -2646,7 +2646,7 @@ def _cyclic(self):
         """Storage for axis cyclicity.
 
         Contains a `set` that identifies which axes are cyclic (and
-        therefore allow cyclic slicing). The set contains a subset of
+        therefore allows cyclic slicing). The set contains a subset of
         the axis identifiers defined by the `_axes` attribute.
 
         .. warning:: Never change the value of the `_cyclic` attribute

cf/field.py

@@ -5155,7 +5155,7 @@ def collapse(
         field construct.
 
         *Example:*
-          Calculate the temporal maximum of the weighted areal means
+          Calculate the temporal maximum of the weighted area means
           using two independent calls:
 
           >>> b = a.collapse('area: mean', weights=True).collapse('T: maximum')
@@ -5166,7 +5166,7 @@ def collapse(
         specifies each axis, and a space delimits the separate collapses).
 
         *Example:*
-          Calculate the temporal maximum of the weighted areal means in
+          Calculate the temporal maximum of the weighted area means in
           a single call, using the cf-netCDF cell methods-like syntax:
 
           >>> b =a.collapse('area: mean T: maximum', weights=True)
@@ -5782,7 +5782,7 @@ def collapse(
                                    numbers of elements.
 
                                  * The start of the first group may be
-                                   before the first first axis element,
+                                   before the first axis element,
                                    depending on the offset defined by the
                                    time duration. For example, if
                                    ``group=cf.Y(month=12)`` then the first

cf/read_write/read.py

@@ -6,7 +6,7 @@
 from urllib.parse import urlparse
 
 import cfdm
-from cfdm.read_write.exceptions import FileTypeError
+from cfdm.read_write.exceptions import DatasetTypeError
 from cfdm.read_write.netcdf import NetCDFRead
 
 from ..aggregate import aggregate as cf_aggregate
@@ -384,7 +384,7 @@ class read(cfdm.read):
 
               .. versionadded:: NEXTVERSION
 
-        {{read store_hdf5_chunks: `bool`, optional}}
+        {{read store_dataset_chunks: `bool`, optional}}
 
             .. versionadded:: NEXTVERSION
 
@@ -502,7 +502,7 @@ def __new__(
         unpack=True,
         warn_valid=False,
         dask_chunks="storage-aligned",
-        store_hdf5_chunks=True,
+        store_dataset_chunks=True,
         domain=False,
         cfa=None,
         cfa_write=None,
@@ -728,7 +728,7 @@ def __new__(
                             storage_options=storage_options,
                             netcdf_backend=netcdf_backend,
                             dask_chunks=dask_chunks,
-                            store_hdf5_chunks=store_hdf5_chunks,
+                            store_dataset_chunks=store_dataset_chunks,
                             cache=cache,
                             cfa=cfa,
                             cfa_write=cfa_write,
@@ -737,7 +737,7 @@ def __new__(
                             unsqueeze=unsqueeze,
                             file_type=file_type,
                         )
-                    except FileTypeError as error:
+                    except DatasetTypeError as error:
                         if file_type is None:
                             file_format_errors.append(error)
                     else:
@@ -764,7 +764,7 @@ def __new__(
                             domain=domain,
                             file_type=file_type,
                         )
-                    except FileTypeError as error:
+                    except DatasetTypeError as error:
                         if file_type is None:
                             file_format_errors.append(error)
                     else:
@@ -773,7 +773,7 @@ def __new__(
 
                 if file_format_errors:
                     error = "\n".join(map(str, file_format_errors))
-                    raise FileTypeError(f"\n{error}")
+                    raise DatasetTypeError(f"\n{error}")
 
                 if domain:
                     file_contents = DomainList(file_contents)

cf/read_write/um/umread.py

@@ -9,7 +9,7 @@
 import dask.array as da
 import numpy as np
 from cfdm import Constructs, is_log_level_info
-from cfdm.read_write.exceptions import FileTypeError
+from cfdm.read_write.exceptions import DatasetTypeError
 from dask.array.core import getter, normalize_chunks
 from dask.base import tokenize
 from netCDF4 import date2num as netCDF4_date2num
@@ -3608,7 +3608,7 @@ def _open_um_file(
             except Exception:
                 pass
 
-            raise FileTypeError(
+            raise DatasetTypeError(
                 f"Can't interpret {filename} as a PP or UM dataset"
             )
 

cf/umread_lib/umfile.py

@@ -2,7 +2,7 @@
 from functools import cmp_to_key
 
 import numpy
-from cfdm.read_write.exceptions import FileTypeError
+from cfdm.read_write.exceptions import DatasetTypeError
 
 from . import cInterface
 from .extraData import ExtraDataUnpacker
@@ -133,7 +133,7 @@ def _detect_file_type(self):
             file_type_obj = c.detect_file_type(self.fd)
         except Exception:
             self.close_fd()
-            raise FileTypeError(
+            raise DatasetTypeError(
                 f"Can't open {self.path} as a PP or UM dataset"
             )
 

cf/units.py

@@ -22,7 +22,7 @@ class Units:
     """
 
     def __new__(cls, *args, **kwargs):
-        """Return a new new Units instance."""
+        """Return a new Units instance."""
         return cfUnits(*args, **kwargs)
 
     @staticmethod