Rename to gifit in code

FNNDSC · Oct 13, 2023 · c59500f · c59500f
1 parent c55128f
commit c59500f
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 15 deletions.
diff --git a/innerspfit/__init__.py → gifit/__init__.py b/innerspfit/__init__.py → gifit/__init__.py
diff --git a/innerspfit/__main__.py → gifit/__main__.py b/innerspfit/__main__.py → gifit/__main__.py
@@ -13,9 +13,9 @@
 from chris_plugin import chris_plugin, PathMapper
 from loguru import logger
 
-from innerspfit import __version__, DISPLAY_TITLE, helpers
-from innerspfit.gi import gyrification_index
-from innerspfit.model import Model
+from gifit import __version__, DISPLAY_TITLE, helpers
+from gifit.gi import gyrification_index
+from gifit.model import Model
 
 parser = ArgumentParser(description='surface_fit wrapper',
                         formatter_class=ArgumentDefaultsHelpFormatter)

diff --git a/innerspfit/gi.py → gifit/gi.py b/innerspfit/gi.py → gifit/gi.py
diff --git a/innerspfit/helpers.py → gifit/helpers.py b/innerspfit/helpers.py → gifit/helpers.py
@@ -2,7 +2,7 @@
 from pathlib import PurePath
 from typing import Iterable
 
-from innerspfit.model import SurfaceFitParams
+from gifit.model import SurfaceFitParams
 
 
 def to_cliargs(sched: Iterable[SurfaceFitParams]) -> Iterable[str]:

diff --git a/innerspfit/model.py → gifit/model.py b/innerspfit/model.py → gifit/model.py
diff --git a/innerspfit/models/a.csv → gifit/models/a.csv b/innerspfit/models/a.csv → gifit/models/a.csv
diff --git a/innerspfit/models/b.csv → gifit/models/b.csv b/innerspfit/models/b.csv → gifit/models/b.csv
diff --git a/innerspfit/models/c.csv → gifit/models/c.csv b/innerspfit/models/c.csv → gifit/models/c.csv
diff --git a/setup.py b/setup.py
@@ -26,18 +26,18 @@ def get_version(rel_path: str) -> str:
 
 
 setup(
-    name='innerspfit',
-    version=get_version('innerspfit/__init__.py'),
+    name='gifit',
+    version=get_version('gifit/__init__.py'),
     description='Outer to inner surface mesh deformation using a radial distance map for human fetal MRI',
     author='FNNDSC',
     author_email='[email protected]',
     url='https://github.com/FNNDSC/pl-gifit',
-    packages=['innerspfit'],
+    packages=['gifit'],
     install_requires=['chris_plugin', 'pandas', 'loguru'],
     license='MIT',
     entry_points={
         'console_scripts': [
-            'innerspfit = innerspfit.__main__:main'
+            'gifit = gifit.__main__:main'
         ]
     },
     classifiers=[
@@ -53,7 +53,7 @@ def get_version(rel_path: str) -> str:
         ]
     },
     package_data={
-        'innerspfit': ['models']
+        'gifit': ['models']
     },
     scripts=scripts
 )
diff --git a/tests/test_helper.py b/tests/test_helper.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from innerspfit import helpers
+from gifit import helpers
 
 
 @pytest.mark.parametrize(

diff --git a/tests/test_join.py b/tests/test_join.py
@@ -1,7 +1,7 @@
 from typing import Iterable
 
-from innerspfit import helpers
-from innerspfit.model import SurfaceFitParams
+from gifit import helpers
+from gifit.model import SurfaceFitParams
 import pytest
 
 PARAMS1 = SurfaceFitParams(

diff --git a/tests/test_model.py b/tests/test_model.py
@@ -1,11 +1,18 @@
+import importlib.resources
+
 import pytest
 
-from innerspfit.model import Model
+from gifit.model import Model
+
+
+@pytest.fixture(scope='session')
+def model_file() -> str:
+    return str(importlib.resources.files('gifit').joinpath('models').joinpath('a.csv'))
 
 
 @pytest.fixture(scope='session')
-def model() -> Model:
-    return Model()
+def model(model_file) -> Model:
+    return Model(model_file)
 
 
 @pytest.mark.parametrize(