cleanup imports

Author: picciama

batchglm/models/base_glm/model.py

@@ -4,12 +4,6 @@
 
 import dask.array
 import numpy as np
-
-try:
-    import anndata
-except ImportError:
-    anndata = None
-
 import scipy
 
 from ...utils.input import InputDataGLM

batchglm/models/base_glm/utils.py

@@ -10,11 +10,6 @@
 
 from .external import groupwise_solve_lm
 
-try:
-    import anndata
-except ImportError:
-    anndata = None
-
 logger = logging.getLogger("batchglm")
 
 

batchglm/models/glm_beta/model.py

@@ -2,11 +2,6 @@
 from typing import Any, Callable, Dict, Optional, Tuple, Union
 
 import dask
-
-try:
-    import anndata
-except ImportError:
-    anndata = None
 import numpy as np
 
 from .external import _ModelGLM

batchglm/models/glm_nb/model.py

@@ -1,9 +1,4 @@
 import abc
-
-try:
-    import anndata
-except ImportError:
-    anndata = None
 from typing import Any, Callable, Dict, Optional, Tuple, Union
 
 import dask.array

batchglm/models/glm_norm/model.py

@@ -2,11 +2,6 @@
 from typing import Any, Callable, Dict, Optional, Tuple, Union
 
 import dask
-
-try:
-    import anndata
-except ImportError:
-    anndata = None
 import numpy as np
 
 from .external import _ModelGLM

batchglm/train/numpy/glm_nb/estimator.py

@@ -26,7 +26,6 @@ def __init__(
         # batch_size: Optional[Union[Tuple[int, int], int]] = None,
         quick_scale: bool = False,
         dtype: str = "float64",
-        **kwargs
     ):
         """
         Performs initialisation and creates a new estimator.

batchglm/utils/data.py

@@ -6,17 +6,6 @@
 import pandas as pd
 import patsy
 
-try:
-    import anndata
-
-    try:
-        from anndata.base import Raw
-    except ImportError:
-        from anndata import Raw
-except ImportError:
-    anndata = None
-    Raw = None
-
 logger = logging.getLogger("batchglm")
 
 

batchglm/utils/input.py

@@ -1,17 +1,8 @@
-try:
-    import anndata
-
-    try:
-        from anndata.base import Raw
-    except ImportError:
-        from anndata import Raw
-except ImportError:
-    anndata = None
-    Raw = None
 import logging
 from operator import indexOf
 from typing import List, Optional, Union
 
+import anndata
 import dask.array
 import numpy as np
 import pandas as pd
@@ -132,7 +123,7 @@ def __init__(
             or isinstance(data, dask.array.core.Array)
         ):
             self.x = data
-        elif isinstance(data, anndata.AnnData) or isinstance(data, Raw):
+        elif isinstance(data, anndata.AnnData) or isinstance(data, anndata.Raw):
             self.x = data.X
         else:
             raise ValueError("type of data %s not recognized" % type(data))