Do not overwrite GDAL_CACHEMAX if set (#338)

* do not overwrite GDAL_CACHEMAX if set * try updating miniconda action * use newer mpl.colormaps object * typo * remove extra _r cmaps
DHI · Jun 4, 2024 · c0f2959 · c0f2959
1 parent 018f963
commit c0f2959
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -144,7 +144,7 @@ jobs:
           key:
             ${{ runner.os }}-conda-${{ matrix.python-version }}-${{ hashFiles('environment.yml') }}
 
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           python-version: ${{ matrix.python-version }}
           environment-file: environment.yml

diff --git a/terracotta/cmaps/generate_cmaps.py b/terracotta/cmaps/generate_cmaps.py
@@ -4,20 +4,19 @@
 """
 
 import numpy as np
-import matplotlib.cm as cm
+import matplotlib as mpl
 
 from terracotta.cmaps.get_cmaps import SUFFIX
 
-ALL_CMAPS = list(cm.cmaps_listed) + list(cm.datad)
-ALL_CMAPS.extend([f"{cmap}_r" for cmap in ALL_CMAPS])
+ALL_CMAPS = list(mpl.colormaps)
 NUM_VALS = 255
 
 
 def generate_maps(out_folder: str) -> None:
     x = np.linspace(0, 1, NUM_VALS)
     for cmap in ALL_CMAPS:
         print(cmap)
-        cmap_fun = cm.get_cmap(cmap)
+        cmap_fun = mpl.colormaps[cmap]
         cmap_vals = cmap_fun(x)
         cmap_uint8 = (cmap_vals * 255).astype("uint8")
         np.save(f"{out_folder}/{cmap.lower()}{SUFFIX}", cmap_uint8)

diff --git a/terracotta/scripts/optimize_rasters.py b/terracotta/scripts/optimize_rasters.py
@@ -32,7 +32,7 @@
 
 IN_MEMORY_THRESHOLD = 10980 * 10980
 
-CACHEMAX = 1024 * 1024 * 512  # 512 MB
+CACHEMAX = os.environ.get("GDAL_CACHEMAX", 1024 * 1024 * 512)  # 512 MB
 
 GDAL_CONFIG = {
     "GDAL_TIFF_INTERNAL_MASK": True,