From c59500f917e0f759102ddde87747668f1eefa65c Mon Sep 17 00:00:00 2001 From: Jennings Zhang Date: Fri, 13 Oct 2023 18:44:05 -0400 Subject: [PATCH] Rename to gifit in code --- {innerspfit => gifit}/__init__.py | 0 {innerspfit => gifit}/__main__.py | 6 +++--- {innerspfit => gifit}/gi.py | 0 {innerspfit => gifit}/helpers.py | 2 +- {innerspfit => gifit}/model.py | 0 {innerspfit => gifit}/models/a.csv | 0 {innerspfit => gifit}/models/b.csv | 0 {innerspfit => gifit}/models/c.csv | 0 setup.py | 10 +++++----- tests/test_helper.py | 2 +- tests/test_join.py | 4 ++-- tests/test_model.py | 13 ++++++++++--- 12 files changed, 22 insertions(+), 15 deletions(-) rename {innerspfit => gifit}/__init__.py (100%) rename {innerspfit => gifit}/__main__.py (96%) rename {innerspfit => gifit}/gi.py (100%) rename {innerspfit => gifit}/helpers.py (92%) rename {innerspfit => gifit}/model.py (100%) rename {innerspfit => gifit}/models/a.csv (100%) rename {innerspfit => gifit}/models/b.csv (100%) rename {innerspfit => gifit}/models/c.csv (100%) diff --git a/innerspfit/__init__.py b/gifit/__init__.py similarity index 100% rename from innerspfit/__init__.py rename to gifit/__init__.py diff --git a/innerspfit/__main__.py b/gifit/__main__.py similarity index 96% rename from innerspfit/__main__.py rename to gifit/__main__.py index 8266045..526f316 100644 --- a/innerspfit/__main__.py +++ b/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 b/gifit/gi.py similarity index 100% rename from innerspfit/gi.py rename to gifit/gi.py diff --git a/innerspfit/helpers.py b/gifit/helpers.py similarity index 92% rename from innerspfit/helpers.py rename to gifit/helpers.py index 5e8bb3d..f18b17b 100644 --- a/innerspfit/helpers.py +++ b/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 b/gifit/model.py similarity index 100% rename from innerspfit/model.py rename to gifit/model.py diff --git a/innerspfit/models/a.csv b/gifit/models/a.csv similarity index 100% rename from innerspfit/models/a.csv rename to gifit/models/a.csv diff --git a/innerspfit/models/b.csv b/gifit/models/b.csv similarity index 100% rename from innerspfit/models/b.csv rename to gifit/models/b.csv diff --git a/innerspfit/models/c.csv b/gifit/models/c.csv similarity index 100% rename from innerspfit/models/c.csv rename to gifit/models/c.csv diff --git a/setup.py b/setup.py index 344fd29..2f48a2d 100644 --- 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='Jennings.Zhang@childrens.harvard.edu', 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 index bf1a843..e7498f1 100644 --- 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 index 6bdc338..5c53e38 100644 --- 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 index eee8718..f96ee52 100644 --- 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(