Merge pull request #65 from cedadev/fix-pip-build-problem

Updated numpy import to fix pip install
cedadev · Feb 6, 2024 · 1622041 · 1622041
2 parents 4465f99 + 4f11638
commit 1622041
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/nappy/utils/common_utils.py b/nappy/utils/common_utils.py
@@ -14,8 +14,6 @@
 from io import StringIO
 import logging
 
-import numpy as np
-
 # Imports from local package
 from nappy import __version__
 from nappy.utils import parse_config
@@ -263,6 +261,9 @@ def get_rank_zero_array_value(arr):
     It returns a float (for a number) or a string (from a string
     or bytes string).
     """
+    # Import numpy here so that pip install works without error
+    import numpy as np
+
     if arr.dtype.type is np.str_:
         return str(arr)
     elif arr.dtype.type is np.bytes_:

diff --git a/requirements.txt b/requirements.txt
@@ -2,5 +2,5 @@ netCDF4
 scipy
 numpy
 xarray
-cf_xarray
+cf_xarray<=0.8.4
 cftime
diff --git a/tests/test_outputs/1010.nc b/tests/test_outputs/1010.nc
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,5 +2,5 @@ netCDF4 @@
     scipy
     numpy
     xarray
-    cf_xarray
+    cf_xarray<=0.8.4
     cftime