dev

Author: davidhassell

Changelog.rst

@@ -8,16 +8,15 @@ Version NEXTVERSION
   ``h5py_options`` parameter
   (https://github.com/NCAS-CMS/cf-python/issues/924)
 * New default backend for netCDF-4 in `cf.read` that allows parallel
-  reading: (https://github.com/NCAS-CMS/cf-python/issues/912)
+  reading: ``h5netcdf-pyfive``
+  (https://github.com/NCAS-CMS/cf-python/issues/912)
 * New optional backend for netCDF-3 in `cf.read` that allows parallel
   reading: ``netcdf_file``
   (https://github.com/NCAS-CMS/cf-python/issues/912)
 * Changed dependency: ``cfdm>=1.13.1.0, <1.13.2.0``
 * Fix for subspacing with cyclic `cf.wi` and `cf.wo` arguments
   (https://github.com/NCAS-CMS/cf-python/issues/887)
 
-----
-
 Version 3.19.0
 --------------
 

cf/__init__.py

@@ -153,12 +153,12 @@
     H5netcdfArray,
     NetCDFArray,
     NetCDF4Array,
-    Netcdf_fileArray,
     PyfiveArray,
     PointTopologyArray,
     RaggedContiguousArray,
     RaggedIndexedArray,
     RaggedIndexedContiguousArray,
+    ScipyNetcdfFileArray,
     SubsampledArray,
     UMArray,
     ZarrArray,

cf/cfimplementation.py

@@ -34,12 +34,12 @@
     GatheredArray,
     H5netcdfArray,
     NetCDF4Array,
-    Netcdf_fileArray,
     PointTopologyArray,
     PyfiveArray,
     RaggedContiguousArray,
     RaggedIndexedArray,
     RaggedIndexedContiguousArray,
+    ScipyNetcdfFileArray,
     SubsampledArray,
     ZarrArray,
 )
@@ -149,7 +149,7 @@ def set_construct(self, parent, construct, axes=None, copy=True, **kwargs):
     GatheredArray=GatheredArray,
     H5netcdfArray=H5netcdfArray,
     NetCDF4Array=NetCDF4Array,
-    Netcdf_fileArray=Netcdf_fileArray,
+    ScipyNetcdfFileArray=ScipyNetcdfFileArray,
     PointTopologyArray=PointTopologyArray,
     PyfiveArray=PyfiveArray,
     Quantization=Quantization,
@@ -208,7 +208,7 @@ def implementation():
      'GatheredArray': cf.data.array.gatheredarray.GatheredArray,
      'H5netcdfArray': cf.data.array.h5netcdfarray.H5netcdfArray,
      'NetCDF4Array': cf.data.array.netcdf4array.NetCDF4Array,
-     'Netcdf_fileArray': cf.data.array.netcdf_filearray.Netcdf_fileArray,
+     'ScipyNetcdfFileArray': cf.data.array.scipynetcdffilearray.ScipyNetcdfFileArray,
      'PointTopologyArray': <class 'cf.data.array.pointtopologyarray.PointTopologyArray'>,
      'PyfiveArray': cf.data.array.pyfivearray.PyfiveArray,
      'Quantization': cf.quantization.Quantization,

cf/data/array/__init__.py

@@ -6,7 +6,7 @@
 from .h5netcdfarray import H5netcdfArray
 from .netcdfarray import NetCDFArray
 from .netcdf4array import NetCDF4Array
-from .netcdf_filearray import Netcdf_fileArray
+from .scipynetcdffilearray import ScipyNetcdfFileArray
 from .pointtopologyarray import PointTopologyArray
 from .pyfivearray import PyfiveArray
 from .raggedcontiguousarray import RaggedContiguousArray

cf/data/array/scipynetcdffilearray.py

@@ -0,0 +1,14 @@
+import cfdm
+
+from ...mixin_container import Container
+
+
+class ScipyNetcdfFileArray(
+    Container,
+    cfdm.ScipyNetcdfFileArray,
+):
+    """A netCDF-3 array accessed with `scipy.io.netcdf_file`.
+
+    .. versionadded:: NEXTVERSION
+
+    """

cf/test/test_read_write.py

@@ -1039,6 +1039,15 @@ def test_write_h5py_options(self):
         f1 = cf.read(tmpfile1)[0]
         self.assertTrue(f1.equals(f0))
 
+    def test_read_netcdf_file(self):
+        """Test cf.read for differing the netcdf_file backend."""
+        f = self.f0
+
+        cf.write(f, tmpfile, fmt="NETCDF3_CLASSIC")
+        g = cf.read(tmpfile, netcdf_backend="netcdf_file")[0]
+
+        self.assertTrue(g.equals(f))
+
 
 if __name__ == "__main__":
     print("Run date:", datetime.datetime.now())