Merge pull request #18 from francescopisu/fix/remove-src-folder

fix: remove src folder
francescopisu · Sep 24, 2023 · 6441f81 · 6441f81
2 parents 214ff7e + 70471d2
commit 6441f81
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 15 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -27,7 +27,7 @@ jobs:
               run: poetry install
 
             - name: Execute tests
-              run: poetry run python -m pytest -v tests/ --cov=src --cov-report=xml -rP
+              run: poetry run python -m pytest -v tests/ --cov=modelsight --cov-report=xml -rP
 
             - name: Upload coverage reports to Codecov
               uses: codecov/codecov-action@v3

diff --git a/docs/conf.py b/docs/conf.py
@@ -21,7 +21,7 @@
     "sphinx.ext.napoleon",
     "sphinx.ext.viewcode",
 ]
-autoapi_dirs = ["../src"]
+autoapi_dirs = ["../modelsight"]
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.

diff --git a/src/modelsight/.gitignore → modelsight/.gitignore b/src/modelsight/.gitignore → modelsight/.gitignore
diff --git a/src/modelsight/__init__.py → modelsight/__init__.py b/src/modelsight/__init__.py → 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 → modelsight/_typing.py b/src/modelsight/_typing.py → modelsight/_typing.py
diff --git a/modelsight/calibration/__init__.py b/modelsight/calibration/__init__.py
@@ -0,0 +1,5 @@
+from .calib import hosmer_lemeshow_plot
+
+__all__ = [
+    "hosmer_lemeshow_plot"
+]
diff --git a/src/modelsight/calibration/calib.py → modelsight/calibration/calib.py b/src/modelsight/calibration/calib.py → 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 → modelsight/config.py b/src/modelsight/config.py → modelsight/config.py
diff --git a/src/modelsight/curves/__init__.py → modelsight/curves/__init__.py b/src/modelsight/curves/__init__.py → 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 → modelsight/curves/_delong.py b/src/modelsight/curves/_delong.py → modelsight/curves/_delong.py
diff --git a/src/modelsight/curves/compare.py → modelsight/curves/compare.py b/src/modelsight/curves/compare.py → 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 → modelsight/curves/roc.py b/src/modelsight/curves/roc.py → 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 → modelsight/settings.toml b/src/modelsight/settings.toml → modelsight/settings.toml
diff --git a/src/modelsight/calibration/__init__.py b/src/modelsight/calibration/__init__.py