merge louvain and prepare extra requires (#897)

server/cli/prepare.py

@@ -160,14 +160,7 @@ def prepare(
         sc.pp.neighbors(adata)
 
     def run_louvain(adata):
-        try:
+        sc.tl.louvain(adata)
-            sc.tl.louvain(adata)
-        except ModuleNotFoundError:
-            click.echo(
-                "\nWarning: louvain module is not installed, no clusters will be calculated. "
-                "To fix this please install cellxgene with the optional feature louvain enabled: "
-                "`pip install cellxgene[louvain]`"
-            )
 
     def run_layout(adata):
         if len(unique(adata.obs["louvain"].values)) < 10:

server/requirements-prepare.txt

@@ -1 +1,3 @@
 scanpy>=1.3.7
+python-igraph
+louvain>=0.6

setup.py

@@ -39,5 +39,5 @@ setup(
         "Topic :: Scientific/Engineering :: Bio-Informatics",
     ],
     entry_points={"console_scripts": ["cellxgene = server.cli.cli:cli"]},
-    extras_require=dict(prepare=requirements_prepare, louvain=["python-igraph", "louvain>=0.6"], gui=["PySide2>=5.12.3", "cefpython3>=66", "requests"]),
+    extras_require=dict(prepare=requirements_prepare, gui=["PySide2>=5.12.3", "cefpython3>=66", "requests"]),
 )