compat: Pillow 11.3.0 (#1429)

Author: hoxbro

datashader/mpl_ext.py

@@ -10,18 +10,10 @@
 from . import transfer_functions as tf
 from .colors import Sets1to3
 from .core import bypixel, Canvas
+from .utils import uint32_to_uint8, uint8_to_uint32
 
-__all__ = ["ScalarDSArtist", "CategoricalDSArtist", "alpha_colormap", "dsshow"]
-
-
-def uint32_to_uint8(img):
-    """Cast a uint32 raster to a 4-channel uint8 RGBA array."""
-    return img.view(dtype=np.uint8).reshape(img.shape + (4,))
 
-
-def uint8_to_uint32(img):
-    """Cast a 4-channel uint8 RGBA array to uint32 raster"""
-    return img.view(dtype=np.uint32).reshape(img.shape[:-1])
+__all__ = ["ScalarDSArtist", "CategoricalDSArtist", "alpha_colormap", "dsshow"]
 
 
 def to_ds_image(binned, rgba):

datashader/tiles.py

@@ -14,6 +14,9 @@
 except ImportError:
     dask, db = None, None
 
+
+from .utils import uint32_to_uint8
+
 __all__ = ['render_tiles', 'MercatorTileDefinition']
 
 
@@ -321,9 +324,14 @@ def render(self, da, level):
             if 0 in arr.shape:
                 continue
 
-            # flip since y tiles go down (Google map tiles
-            img = fromarray(np.flip(arr.data, 0), 'RGBA')
+            # flip since y tiles go down (Google map tiles)
+            data = np.flip(arr.data, 0)
+
+            # Create RGBA view for img
+            if len(data.shape) == 2 and data.dtype == np.uint32:
+               data = uint32_to_uint8(data)
 
+            img = fromarray(data)
             if self.post_render_func:
                 extras = dict(x=x, y=y, z=z)
                 img = self.post_render_func(img, **extras)

datashader/transfer_functions/__init__.py

@@ -12,7 +12,7 @@
 import xarray as xr
 
 from datashader.colors import rgb, Sets1to3
-from datashader.utils import nansum_missing, ngjit
+from datashader.utils import nansum_missing, ngjit, uint32_to_uint8
 
 try:
     import dask.array as da
@@ -39,7 +39,10 @@ def to_pil(self, origin='lower'):
         if cupy:
             data = cupy.asnumpy(data)
         arr = np.flipud(data) if origin == 'lower' else data
-        return fromarray(arr, 'RGBA')
+
+        if len(arr.shape) == 2 and arr.dtype == np.uint32:
+           arr = uint32_to_uint8(arr)
+        return fromarray(arr)
 
     def to_bytesio(self, format='png', origin='lower'):
         fp = BytesIO()

datashader/utils.py

@@ -1010,3 +1010,13 @@ def row_min_n_in_place_3d(ret, other):
     for y in range(ny):
         for x in range(nx):
             _row_min_n_impl(ret[y, x], other[y, x])
+
+
+def uint32_to_uint8(img):
+    """Cast a uint32 raster to a 4-channel uint8 RGBA array."""
+    return img.view(dtype=np.uint8).reshape(img.shape + (4,))
+
+
+def uint8_to_uint32(img):
+    """Cast a 4-channel uint8 RGBA array to uint32 raster"""
+    return img.view(dtype=np.uint32).reshape(img.shape[:-1])

pixi.toml

@@ -103,7 +103,7 @@ geodatasets = "*"
 geopandas-base = "*"
 netcdf4 = "*"
 pyarrow = "*"
-pillow = "<11.3.0"  # Temp. upper pin
+pillow = "*"
 pyogrio = "*"
 rasterio = "*"
 rioxarray = "*"