diff --git a/src/modelsight/.gitignore b/modelsight/.gitignore similarity index 100% rename from src/modelsight/.gitignore rename to modelsight/.gitignore diff --git a/src/modelsight/__init__.py b/modelsight/__init__.py similarity index 60% rename from src/modelsight/__init__.py rename to modelsight/__init__.py index d3fd63c..8c8e289 100644 --- a/src/modelsight/__init__.py +++ b/modelsight/__init__.py @@ -1,10 +1,14 @@ # read version from installed package from importlib.metadata import version -from src.modelsight import calibration +from modelsight import ( + calibration, + curves +) __all__ = [ - "calibration" + "calibration", + "curves" ] # __version__ = version("modelsight") diff --git a/src/modelsight/_typing.py b/modelsight/_typing.py similarity index 100% rename from src/modelsight/_typing.py rename to modelsight/_typing.py diff --git a/modelsight/calibration/__init__.py b/modelsight/calibration/__init__.py new file mode 100644 index 0000000..2579212 --- /dev/null +++ b/modelsight/calibration/__init__.py @@ -0,0 +1,5 @@ +from .calib import hosmer_lemeshow_plot + +__all__ = [ + "hosmer_lemeshow_plot" +] \ No newline at end of file diff --git a/src/modelsight/calibration/calib.py b/modelsight/calibration/calib.py similarity index 99% rename from src/modelsight/calibration/calib.py rename to modelsight/calibration/calib.py index 37f9a60..e2d5f36 100644 --- a/src/modelsight/calibration/calib.py +++ b/modelsight/calibration/calib.py @@ -7,7 +7,7 @@ from typing import Tuple import matplotlib.pyplot as plt -from src.modelsight._typing import ArrayLike +from modelsight._typing import ArrayLike def ntile_name(n: int) -> str: diff --git a/src/modelsight/config.py b/modelsight/config.py similarity index 100% rename from src/modelsight/config.py rename to modelsight/config.py diff --git a/src/modelsight/curves/__init__.py b/modelsight/curves/__init__.py similarity index 61% rename from src/modelsight/curves/__init__.py rename to modelsight/curves/__init__.py index 3d90198..06f0b45 100644 --- a/src/modelsight/curves/__init__.py +++ b/modelsight/curves/__init__.py @@ -1,5 +1,5 @@ -from src.modelsight.curves.roc import average_roc_curves -from src.modelsight.curves.compare import ( +from .roc import average_roc_curves +from .compare import ( roc_single_comparison, roc_comparisons, add_annotations ) diff --git a/src/modelsight/curves/_delong.py b/modelsight/curves/_delong.py similarity index 100% rename from src/modelsight/curves/_delong.py rename to modelsight/curves/_delong.py diff --git a/src/modelsight/curves/compare.py b/modelsight/curves/compare.py similarity index 99% rename from src/modelsight/curves/compare.py rename to modelsight/curves/compare.py index aa298b8..aa4310b 100644 --- a/src/modelsight/curves/compare.py +++ b/modelsight/curves/compare.py @@ -8,8 +8,8 @@ from matplotlib import patches import matplotlib.pyplot as plt -from src.modelsight.curves._delong import delong_roc_test -from src.modelsight._typing import CVModellingOutput +from modelsight.curves._delong import delong_roc_test +from modelsight._typing import CVModellingOutput def annot_stat_vertical(text:str, x: float, diff --git a/src/modelsight/curves/roc.py b/modelsight/curves/roc.py similarity index 99% rename from src/modelsight/curves/roc.py rename to modelsight/curves/roc.py index 7e7d97c..b0e2629 100644 --- a/src/modelsight/curves/roc.py +++ b/modelsight/curves/roc.py @@ -6,7 +6,7 @@ from sklearn.metrics import roc_curve from scikits.bootstrap import bootstrap_indices as scikits_boot_indices -from src.modelsight._typing import CVModellingOutput, SeedType +from modelsight._typing import CVModellingOutput, SeedType def average_roc_curves(cv_preds: Dict[str, CVModellingOutput], diff --git a/src/modelsight/settings.toml b/modelsight/settings.toml similarity index 100% rename from src/modelsight/settings.toml rename to modelsight/settings.toml diff --git a/src/modelsight/calibration/__init__.py b/src/modelsight/calibration/__init__.py deleted file mode 100644 index 6388cbb..0000000 --- a/src/modelsight/calibration/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from src.modelsight.calibration.calib import hosmer_lemeshow_plot - -__all__ = [ - "hosmer_lemeshow_plot" -] \ No newline at end of file