Remove numpy version upper bound restriction (#324)

* remove numpy version upper bound restriction * avoid warning when converting images with nans * install crick via pip in conda env --------- Co-authored-by: Dion Häfner <[email protected]>
DHI · Dec 14, 2023 · 066fde4 · 066fde4
1 parent 3cbc26c
commit 066fde4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/environment.yml b/environment.yml
@@ -7,7 +7,7 @@ dependencies:
   - numpy
   - rasterio>=1.3.0
   - shapely
-  - crick
   - pip
   - pip:
+    - crick
     - -e .[recommended]
diff --git a/setup.py b/setup.py
@@ -17,9 +17,6 @@
 
 numpy_version = ">=1.15,!=1.17.0"
 
-# TODO: remove when crick is updated
-numpy_version += ",<1.24"
-
 setup(
     # metadata
     name="terracotta",

diff --git a/terracotta/image.py b/terracotta/image.py
@@ -156,6 +156,8 @@ def to_uint8(data: Array, lower_bound: Number, upper_bound: Number) -> Array:
     """Re-scale an array to [1, 255] and cast to uint8 (0 is used for transparency)"""
     rescaled = contrast_stretch(data, (lower_bound, upper_bound), (1, 255), clip=True)
     rescaled = np.rint(rescaled)
+    # explicitly set NaNs to 0 to avoid warnings
+    rescaled[~np.isfinite(rescaled)] = 0
     return rescaled.astype(np.uint8)
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ dependencies: @@
       - numpy
       - rasterio>=1.3.0
       - shapely
-      - crick
       - pip
       - pip:
+        - crick
         - -e .[recommended]