Resolve conflicts w/ my developmental branch

aristoteleo · Sep 13, 2023 · 86eadf3 · 86eadf3
1 parent d40edbf
commit 86eadf3
Show file tree

Hide file tree

Showing 11 changed files with 613 additions and 4,740 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -10,9 +10,11 @@ gpytorch
 ipywidgets>=7.7.1
 kneed>=0.7.0
 kornia>=0.6.4
+leidenalg>=0.10.0
 loompy>=3.0.5
 mapclassify>=2.4.2
 matplotlib<=3.5.3
+mpi4py
 nbconvert
 networkx>=2.6.3
 # ngs_tools>=1.6.0

diff --git a/spateo/plotting/static/interactions.py b/spateo/plotting/static/interactions.py
diff --git a/spateo/tools/ST_regression/__init__.py b/spateo/tools/ST_regression/__init__.py