fix circular import

src/FlowSOM/main.py

@@ -13,10 +13,9 @@
 from scipy.stats import median_abs_deviation
 from sklearn.base import check_is_fitted
 
+from flowsom.io import read_csv, read_FCS
 from flowsom.models.flowsom_estimator import FlowSOMEstimator
-
-from .io import read_csv, read_FCS
-from .tl import get_channels, get_markers
+from flowsom.tl import get_channels, get_markers
 
 
 class FlowSOM:

src/FlowSOM/models/__init__.py

@@ -1,6 +1,6 @@
-from flowsom.models._som import SOM, map_data_to_codes
-from flowsom.models.base_cluster_estimator import BaseClusterEstimator
-from flowsom.models.base_flowsom_estimator import BaseFlowSOMEstimator
-from flowsom.models.consensus_cluster import ConsensusCluster
-from flowsom.models.flowsom_estimator import FlowSOMEstimator
-from flowsom.models.som_estimator import SOMEstimator
+from ._som import SOM, map_data_to_codes  # isort:skip
+from .base_cluster_estimator import BaseClusterEstimator  # isort:skip
+from .som_estimator import SOMEstimator  # isort:skip
+from .base_flowsom_estimator import BaseFlowSOMEstimator  # isort:skip
+from .consensus_cluster import ConsensusCluster
+from .flowsom_estimator import FlowSOMEstimator

src/FlowSOM/models/base_flowsom_estimator.py

@@ -1,6 +1,6 @@
 from sklearn.utils.validation import check_is_fitted
 
-from flowsom.models import BaseClusterEstimator
+from . import BaseClusterEstimator
 
 
 class BaseFlowSOMEstimator(BaseClusterEstimator):

src/FlowSOM/models/consensus_cluster.py

@@ -14,7 +14,7 @@
 import numpy as np
 from sklearn.cluster import AgglomerativeClustering
 
-from flowsom.models import BaseClusterEstimator
+from . import BaseClusterEstimator
 
 
 class ConsensusCluster(BaseClusterEstimator):

src/FlowSOM/models/flowsom_estimator.py

@@ -1,5 +1,4 @@
-from flowsom.models import ConsensusCluster, SOMEstimator
-from flowsom.models.base_flowsom_estimator import BaseFlowSOMEstimator
+from . import BaseFlowSOMEstimator, ConsensusCluster, SOMEstimator
 
 
 class FlowSOMEstimator(BaseFlowSOMEstimator):

src/FlowSOM/models/som_estimator.py

@@ -3,7 +3,7 @@
 from scipy.spatial.distance import cdist, pdist, squareform
 from sklearn.utils.validation import check_is_fitted
 
-from flowsom.models import SOM, BaseClusterEstimator, map_data_to_codes
+from . import SOM, BaseClusterEstimator, map_data_to_codes
 
 
 class SOMEstimator(BaseClusterEstimator):