Merge pull request #283 from davidhassell/numpy-to-np

Change `numpy` to `np`

cfdm/cellmethod.py

@@ -1,7 +1,7 @@
 import logging
 from copy import deepcopy
 
-import numpy
+import numpy as np
 
 from . import core, mixin
 from .data import Data
@@ -529,7 +529,7 @@ def sorted(self, indices=None):
             return new
 
         if indices is None:
-            indices = numpy.argsort(axes)
+            indices = np.argsort(axes)
         elif len(indices) != len(axes):
             raise ValueError(
                 f"Can't sort cell method axes. The given indices ({indices}) "

cfdm/constants.py

@@ -2,7 +2,7 @@
 import sys
 from enum import Enum
 
-import numpy
+import numpy as np
 
 """A dictionary of useful constants.
 
@@ -57,4 +57,4 @@ class ValidLogLevels(Enum):
 >>> f[...] = cfdm.masked
 
 """
-masked = numpy.ma.masked
+masked = np.ma.masked

cfdm/core/__init__.py

@@ -31,7 +31,7 @@
     raise ImportError(_error0 + str(error1))
 
 try:
-    import numpy
+    import numpy as np
 except ImportError as error1:
     raise ImportError(_error0 + str(error1))
 
@@ -61,10 +61,10 @@
 
 # Check the version of numpy
 _minimum_vn = "1.15"
-if Version(numpy.__version__) < Version(_minimum_vn):
+if Version(np.__version__) < Version(_minimum_vn):
     raise ValueError(
         f"Bad numpy version: cfdm.core requires numpy>={_minimum_vn}. "
-        f"Got {numpy.__version__} at {numpy.__file__}"
+        f"Got {np.__version__} at {np.__file__}"
     )
 
 from .constructs import Constructs

cfdm/core/data/data.py

@@ -1,4 +1,4 @@
-import numpy
+import numpy as np
 
 from .. import abstract
 from .abstract import Array
@@ -167,7 +167,7 @@ def array(self):
         array = self._get_Array().array
 
         # Set the numpy array fill value
-        if numpy.ma.isMA(array):
+        if np.ma.isMA(array):
             array.set_fill_value(self.get_fill_value(None))
 
         return array
@@ -788,8 +788,8 @@ def _set_Array(self, array, copy=True):
 
         """
         if not isinstance(array, Array):
-            if not isinstance(array, numpy.ndarray):
-                array = numpy.asanyarray(array)
+            if not isinstance(array, np.ndarray):
+                array = np.asanyarray(array)
 
             array = NumpyArray(array)
 

cfdm/core/data/numpyarray.py

@@ -1,4 +1,4 @@
-import numpy
+import numpy as np
 
 from . import abstract
 
@@ -101,10 +101,10 @@ def array(self):
         """
         array = self._get_component("array")
 
-        if not array.ndim and numpy.ma.isMA(array):
-            # This is because numpy.ma.copy doesn't work for
+        if not array.ndim and np.ma.isMA(array):
+            # This is because np.ma.copy doesn't work for
             # scalar arrays (at the moment, at least)
-            ma_array = numpy.ma.empty((), dtype=array.dtype)
+            ma_array = np.ma.empty((), dtype=array.dtype)
             ma_array[...] = array
             array = ma_array
         else:

cfdm/core/dimensioncoordinate.py

@@ -1,4 +1,4 @@
-import numpy
+import numpy as np
 
 from . import abstract
 
@@ -104,7 +104,7 @@ def set_data(self, data, copy=True, inplace=True):
         None
 
         """
-        if numpy.ndim(data) != 1:
+        if np.ndim(data) != 1:
             raise ValueError(
                 "Dimension coordinate construct must have 1-dimensional data. "
                 f"Got {data!r}"

cfdm/core/field.py

@@ -1,4 +1,4 @@
-import numpy
+import numpy as np
 
 from . import Constructs, Domain, abstract, mixin
 
@@ -531,9 +531,9 @@ def set_data(self, data, axes=None, copy=True, inplace=True):
         if axes is None:
             existing_axes = f.get_data_axes(default=None)
             if existing_axes is not None:
-                f.set_data_axes(axes=existing_axes, _shape=numpy.shape(data))
+                f.set_data_axes(axes=existing_axes, _shape=np.shape(data))
         else:
-            f.set_data_axes(axes=axes, _shape=numpy.shape(data))
+            f.set_data_axes(axes=axes, _shape=np.shape(data))
 
         super(Field, f).set_data(data, copy=copy, inplace=True)
 

cfdm/core/functions.py

@@ -4,7 +4,7 @@
 from pickle import dumps, loads
 
 import netCDF4
-import numpy
+import numpy as np
 
 from . import __cf_version__, __file__, __version__
 
@@ -60,7 +60,7 @@ def environment(display=True, paths=True):
         "netcdf library": (netCDF4.__netcdf4libversion__, ""),
         "Python": (platform.python_version(), sys.executable),
         "netCDF4": (netCDF4.__version__, os.path.abspath(netCDF4.__file__)),
-        "numpy": (numpy.__version__, os.path.abspath(numpy.__file__)),
+        "numpy": (np.__version__, os.path.abspath(np.__file__)),
         "cfdm.core": (__version__, os.path.abspath(__file__)),
     }
     string = "{0}: {1!s}"

cfdm/data/netcdfarray.py

@@ -1,5 +1,5 @@
 import netCDF4
-import numpy
+import numpy as np
 
 from . import abstract
 from .mixin import FileArrayMixin
@@ -239,7 +239,7 @@ def __getitem__(self, indices):
             # A netCDF string type scalar variable comes out as Python
             # str object, so convert it to a numpy array.
             # --------------------------------------------------------
-            array = numpy.array(array, dtype=f"U{len(array)}")
+            array = np.array(array, dtype=f"U{len(array)}")
 
         if not self.ndim:
             # Hmm netCDF4 has a thing for making scalar size 1, 1d
@@ -260,9 +260,9 @@ def __getitem__(self, indices):
 
             array = netCDF4.chartostring(array)
             shape = array.shape
-            array = numpy.array([x.rstrip() for x in array.flat], dtype="U")
-            array = numpy.reshape(array, shape)
-            array = numpy.ma.masked_where(array == "", array)
+            array = np.array([x.rstrip() for x in array.flat], dtype="U")
+            array = np.reshape(array, shape)
+            array = np.ma.masked_where(array == "", array)
         elif not string_type and kind == "O":
             # --------------------------------------------------------
             # A netCDF string type N-d (N>=1) variable comes out as a
@@ -273,7 +273,7 @@ def __getitem__(self, indices):
             # --------------------------------------------------------
             # netCDF4 does not auto-mask VLEN variable, so do it here.
             # --------------------------------------------------------
-            array = numpy.ma.where(array == "", numpy.ma.masked, array)
+            array = np.ma.where(array == "", np.ma.masked, array)
 
         return array
 

cfdm/mixin/container.py

@@ -1,6 +1,6 @@
 import logging
 
-import numpy
+import numpy as np
 
 from ..decorators import _manage_log_level_via_verbosity
 from ..docstring import _docstring_substitution_definitions
@@ -143,19 +143,19 @@ def _equals(
             # --------------------------------------------------------
             return eq(x, **kwargs)
 
-        x = numpy.asanyarray(x)
-        y = numpy.asanyarray(y)
+        x = np.asanyarray(x)
+        y = np.asanyarray(y)
         if x.shape != y.shape:
             return False
 
         #        # ------------------------------------------------------------
         #        # Cast x and y as numpy arrays
         #        # ------------------------------------------------------------
-        #        if not isinstance(x, numpy.ndarray):
-        #            x = numpy.asanyarray(x)
+        #        if not isinstance(x, np.ndarray):
+        #            x = np.asanyarray(x)
         #
-        #        if not isinstance(y, numpy.ndarray):
-        #            y = numpy.asanyarray(y)
+        #        if not isinstance(y, np.ndarray):
+        #            y = np.asanyarray(y)
 
         # THIS IS WHERE SOME NUMPY FUTURE WARNINGS ARE COMING FROM
 
@@ -166,14 +166,14 @@ def _equals(
             ):
                 return False
 
-        x_is_masked = numpy.ma.isMA(x)
-        y_is_masked = numpy.ma.isMA(y)
+        x_is_masked = np.ma.isMA(x)
+        y_is_masked = np.ma.isMA(y)
 
         if not (x_is_masked or y_is_masked):
             try:
-                return bool(numpy.allclose(x, y, rtol=rtol, atol=atol))
+                return bool(np.allclose(x, y, rtol=rtol, atol=atol))
             except (IndexError, NotImplementedError, TypeError):
-                return bool(numpy.all(x == y))
+                return bool(np.all(x == y))
         else:
             if x_is_masked and y_is_masked:
                 if (x.mask != y.mask).any():
@@ -184,10 +184,10 @@ def _equals(
                 return False
 
             try:
-                return bool(numpy.ma.allclose(x, y, rtol=rtol, atol=atol))
+                return bool(np.ma.allclose(x, y, rtol=rtol, atol=atol))
             except (IndexError, NotImplementedError, TypeError):
-                out = numpy.ma.all(x == y)
-                if out is numpy.ma.masked:
+                out = np.ma.all(x == y)
+                if out is np.ma.masked:
                     return True
                 else:
                     return bool(out)

cfdm/read_write/netcdf/netcdfread.py

@@ -16,7 +16,6 @@
 
 import netCDF4
 import netcdf_flattener
-import numpy
 import numpy as np
 from packaging.version import Version