Merge branch 'main' into feature/202306_support_multipolygons

Author: timtreis

.pre-commit-config.yaml

@@ -9,25 +9,25 @@ ci:
     skip: []
 repos:
     - repo: https://github.com/psf/black
-      rev: 23.3.0
+      rev: 23.7.0
       hooks:
           - id: black
     - repo: https://github.com/pre-commit/mirrors-prettier
-      rev: v3.0.0-alpha.9-for-vscode
+      rev: v3.0.1
       hooks:
           - id: prettier
     - repo: https://github.com/asottile/blacken-docs
-      rev: 1.13.0
+      rev: 1.15.0
       hooks:
           - id: blacken-docs
     - repo: https://github.com/pre-commit/mirrors-mypy
-      rev: v1.3.0
+      rev: v1.5.0
       hooks:
           - id: mypy
             additional_dependencies: [numpy, types-requests]
             exclude: tests/|docs/
-    - repo: https://github.com/charliermarsh/ruff-pre-commit
-      rev: v0.0.272
+    - repo: https://github.com/astral-sh/ruff-pre-commit
+      rev: v0.0.284
       hooks:
           - id: ruff
             args: [--fix, --exit-non-zero-on-fix]

CHANGELOG.md

@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning][].
 
 ### Fixed
 
+-   Legend order is now deterministic (#143)
+
 ## [0.0.4] - 2023-08-11
 
 ### Fixed

src/spatialdata_plot/pl/render.py

@@ -233,7 +233,8 @@ def assign_fill_and_outline_to_row(
 
     cax = ax.add_collection(_cax)
 
-    palette = ListedColormap(set(color_vector)) if render_params.palette is None else render_params.palette
+    # Using dict.fromkeys here since set returns in arbitrary order
+    palette = ListedColormap(dict.fromkeys(color_vector)) if render_params.palette is None else render_params.palette
 
     _ = _decorate_axs(
         ax=ax,

src/spatialdata_plot/pl/utils.py

@@ -805,8 +805,7 @@ def _map_color_seg(
 
     if seg_boundaries:
         seg_bound: ArrayLike = np.clip(seg_im - find_boundaries(seg)[:, :, None], 0, 1)
-        seg_bound = np.dstack((seg_bound, np.where(val_im > 0, 1, 0)))  # add transparency here
-        return seg_bound
+        return np.dstack((seg_bound, np.where(val_im > 0, 1, 0)))  # add transparency here
 
     return np.dstack((seg_im, np.where(val_im > 0, 1, 0)))
 
@@ -847,11 +846,11 @@ def _get_palette(
 
     if isinstance(palette, str):
         cmap = plt.get_cmap(palette)
-        palette = [to_hex(x) for x in cmap(np.linspace(0, 1, len_cat), alpha=alpha)]
     elif isinstance(palette, ListedColormap):
-        palette = [to_hex(x) for x in palette(np.linspace(0, 1, len_cat), alpha=alpha)]
+        cmap = palette
     else:
         raise TypeError(f"Palette is {type(palette)} but should be string or `ListedColormap`.")
+    palette = [to_hex(np.round(x, 5)) for x in cmap(np.linspace(0, 1, len_cat), alpha=alpha)]
 
     return dict(zip(categories, palette))