From 0f8e07d5ec58c1e9d0c84c4e31d338136df331b3 Mon Sep 17 00:00:00 2001
From: Xiaojie Qiu <xqiu@uw.edu>
Date: Sun, 11 Apr 2021 16:01:29 -0400
Subject: [PATCH] update

---
 .readthedocs.yml              |  2 +-
 docs/requirements.txt         |  4 ++--
 dynamo/preprocessing/utils.py |  9 +++++----
 pyproject.toml                | 10 +++++-----
 requirements.txt              |  4 ++--
 sinfo-requirements.txt        |  2 +-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index 0ee0f2329..6e3fdaf99 100755
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -9,6 +9,6 @@ sphinx:
   configuration: docs/source/conf.py
 
 python:
-    version: 3.6
+    version: 3.7
     install:
         - requirements: docs/requirements.txt
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 59a212dff..b9d4d704d 100755
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -13,7 +13,7 @@ pandas>=0.25.1
 scipy>=1.0
 scikit-learn>=0.19.1
 cvxopt>=1.2.3
-anndata==0.7.5
+anndata>=0.7.6
 loompy>=3.0.5
 matplotlib>=3.1.0
 trimap>=1.0.11
@@ -28,4 +28,4 @@ seaborn>=0.9.0
 colorcet>=2.0.1
 tqdm
 python-igraph>=0.7.1
-pynndescent>=0.4.8
+pynndescent>=0.5.2
diff --git a/dynamo/preprocessing/utils.py b/dynamo/preprocessing/utils.py
index 314a34a2e..9c9d37eca 100755
--- a/dynamo/preprocessing/utils.py
+++ b/dynamo/preprocessing/utils.py
@@ -218,10 +218,11 @@ def cook_dist(model, X, good):
 
 # ---------------------------------------------------------------------------------------------------
 # preprocess utilities
-def filter_genes_by_pattern(adata: anndata.AnnData,
-                            patterns: tuple = ('MT-', 'RPS', 'RPL', 'MRPS', 'MRPL', 'ERCC-'),
-                            drop_genes: bool = False
-                            ) -> Union[anndata.AnnData, None]:
+def filter_genes_by_pattern(
+        adata: anndata.AnnData,
+        patterns: tuple = ('MT-', 'RPS', 'RPL', 'MRPS', 'MRPL', 'ERCC-'),
+        drop_genes: bool = False,
+) -> Union[list, None]:
     """Utility function to filter mitochondria, ribsome protein and ERCC spike-in genes, etc."""
     logger = LoggerManager.gen_logger("dynamo-utils")
 
diff --git a/pyproject.toml b/pyproject.toml
index 808e54665..f9cc585ab 100755
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,24 +4,24 @@ build-backend = 'flit.buildapi'
 
 [tool.flit.metadata]
 module = 'dynamo'
-author = 'Xiaojie Qiu, Yan Zhang'
+author = 'Xiaojie Qiu, Yan Zhang, Ke Ni'
 author-email = 'xqiu.sc@gmail.com'
 home-page = 'https://github.com/aristoteleo/dynamo-release'
 license = 'BSD'
 description-file = 'README.md'
-requires-python = '>=3.6'
+requires-python = '>=3.7'
 requires = ['numpy>=1.18.1',
             'pandas>=0.25.1',
             'scipy>=1.0',
             'scikit-learn>=0.19.1',
             'cvxopt>=1.2.3',
-            'anndata>=0.7.4',
+            'anndata>=0.7.6',
             'loompy>=3.0.5',
             'matplotlib>=3.1.0',
             'trimap>=1.0.11',
             'setuptools',
             'numdifftools>=0.9.39',
-            'umap-learn>=0.4.3',
+            'umap-learn>=0.5.1',
             'hdbscan>=0.8.26',
             'PATSY>=0.5.1',
             'statsmodels>=0.9.0',
@@ -30,7 +30,7 @@ requires = ['numpy>=1.18.1',
             'colorcet>=2.0.1',
             'tqdm',
             'python-igraph>=0.7.1',
-            'pynndescent>=0.4.8',
+            'pynndescent>=0.5.2',
             'joblib',
             'setuptools']
 requires-extra = { doc = ['docutils'], test = ['pytest', 'sympy>=1.4'], spatial = ['pysal>2.0.0'], dimension_reduction = ['fitsne>=1.0.1'], bigdata_visualization = ["datashader>=0.9.0", "bokeh>=1.4.0", "holoviews>=1.9.2"] }
diff --git a/requirements.txt b/requirements.txt
index 4ed4e2a55..a75c68639 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ pandas>=0.25.1
 scipy>=1.0
 scikit-learn>=0.19.1
 cvxopt>=1.2.3
-anndata==0.7.5
+anndata>=0.7.6
 loompy>=3.0.5
 matplotlib>=3.1.0
 trimap>=1.0.11
@@ -18,6 +18,6 @@ seaborn>=0.9.0
 colorcet>=2.0.1
 tqdm
 python-igraph>=0.7.1
-pynndescent>=0.4.8
+pynndescent>=0.5.2
 pre-commit
 networkx
diff --git a/sinfo-requirements.txt b/sinfo-requirements.txt
index e45b5e6ba..fdc8a5b16 100644
--- a/sinfo-requirements.txt
+++ b/sinfo-requirements.txt
@@ -1,4 +1,4 @@
-anndata==0.7.5
+anndata>=0.7.6
 scanpy==1.6.0
 sinfo==0.3.1
 IPython==7.20.0