diff --git a/src/FlowSOM/main.py b/src/FlowSOM/main.py index 98c1f02..86a8512 100644 --- a/src/FlowSOM/main.py +++ b/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: diff --git a/src/FlowSOM/models/__init__.py b/src/FlowSOM/models/__init__.py index fc99122..7133ef6 100644 --- a/src/FlowSOM/models/__init__.py +++ b/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 diff --git a/src/FlowSOM/models/base_flowsom_estimator.py b/src/FlowSOM/models/base_flowsom_estimator.py index e497507..d49d4e5 100644 --- a/src/FlowSOM/models/base_flowsom_estimator.py +++ b/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): diff --git a/src/FlowSOM/models/consensus_cluster.py b/src/FlowSOM/models/consensus_cluster.py index 8cf921a..95a5da4 100644 --- a/src/FlowSOM/models/consensus_cluster.py +++ b/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): diff --git a/src/FlowSOM/models/flowsom_estimator.py b/src/FlowSOM/models/flowsom_estimator.py index b141c40..f88c620 100644 --- a/src/FlowSOM/models/flowsom_estimator.py +++ b/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): diff --git a/src/FlowSOM/models/som_estimator.py b/src/FlowSOM/models/som_estimator.py index adf42af..e313e68 100644 --- a/src/FlowSOM/models/som_estimator.py +++ b/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):