rename gmapi to gmapy

IAEA-NDS · Oct 24, 2022 · 23abc1e · 23abc1e
1 parent 493e21d
commit 23abc1e
Show file tree

Hide file tree

Showing 90 changed files with 117 additions and 118 deletions.
diff --git a/examples/example-001-run-gmap.py b/examples/example-001-run-gmap.py
@@ -20,7 +20,7 @@
 ############################################################
 
 import argparse
-from gmapi.legacy.legacy_gmap import run_gmap
+from gmapy.legacy.legacy_gmap import run_gmap
 
 
 if __name__ == '__main__':

diff --git a/examples/example-002-chisquare-calc.ipynb b/examples/example-002-chisquare-calc.ipynb
@@ -22,8 +22,8 @@
    "source": [
     "import numpy as np\n",
     "from scipy.sparse.linalg import spsolve\n",
-    "from gmapi.legacy.legacy_gmap import run_gmap\n",
-    "from gmapi.mappings.compound_map import CompoundMap\n",
+    from gmapy.legacy.legacy_gmap import run_gmap\n",
+    from gmapy.mappings.compound_map import CompoundMap\n",
     "dbfile = '../tests/testdata/data-2017-07-26.gma'"
    ]
   },

diff --git a/examples/example-003-plot-evaluation-results.ipynb b/examples/example-003-plot-evaluation-results.ipynb
@@ -24,8 +24,8 @@
     "import pandas as pd\n",
     "from numpy.random import default_rng\n",
     "import matplotlib.pyplot as plt\n",
-    "from gmapi.legacy.legacy_gmap import run_gmap\n",
-    "from gmapi.mappings.compound_map import CompoundMap\n",
+    from gmapy.legacy.legacy_gmap import run_gmap\n",
+    from gmapy.mappings.compound_map import CompoundMap\n",
     "dbfile = '../tests/testdata/data-2017-07-26.gma'"
    ]
   },

diff --git a/examples/example-004-python-versus-fortran-gmap.ipynb b/examples/example-004-python-versus-fortran-gmap.ipynb
@@ -21,7 +21,7 @@
    "source": [
     "import numpy as np\n",
     "import pandas as pd\n",
-    "from gmapi.legacy.legacy_gmap import run_gmap"
+    from gmapy.legacy.legacy_gmap import run_gmap"
    ]
   },
   {

diff --git a/examples/example-005-compute-sacs-results.ipynb b/examples/example-005-compute-sacs-results.ipynb
@@ -21,7 +21,7 @@
    "source": [
     "import numpy as np\n",
     "import pandas as pd\n",
-    "from gmapi.legacy.legacy_gmap import run_gmap"
+    from gmapy.legacy.legacy_gmap import run_gmap"
    ]
   },
   {
@@ -584,7 +584,7 @@
     }
    ],
    "source": [
-    "from gmapi.mappings.compound_map import CompoundMap\n",
+    from gmapy.mappings.compound_map import CompoundMap\n",
     "compmap = CompoundMap(fix_sacs_jacobian=True)\n",
     "predvals1 = compmap.propagate(syntable1, syntable1.POST.to_numpy())\n",
     "predvals2 = compmap.propagate(syntable2, syntable2.POST.to_numpy())\n",

diff --git a/examples/example-006-gmap-with-ratio-of-sacs.py b/examples/example-006-gmap-with-ratio-of-sacs.py
@@ -1,11 +1,11 @@
 import sys
 sys.path.append('..')
-from gmapi.data_management.dataset import Dataset
-from gmapi.data_management.datablock import Datablock
-from gmapi.data_management.datablock_list import DatablockList
+from gmapy.data_management.dataset import Dataset
+from gmapy.data_management.datablock import Datablock
+from gmapy.data_management.datablock_list import DatablockList
 import numpy as np
-from gmapi.gmap import run_gmap_simplified
-from gmapi.data_management.database_IO import (read_json_gma_database,
+from gmapy.gmap import run_gmap_simplified
+from gmapy.data_management.database_IO import (read_json_gma_database,
         read_legacy_gma_database)
 
 # read the database of standards 2017 and perform the gls fitting

diff --git a/examples/standard_studies/analysis_001/analysis_after_2017.py b/examples/standard_studies/analysis_001/analysis_after_2017.py
@@ -3,9 +3,9 @@
 sys.path.append('../..')
 sys.path.append('../../..')
 from copy import deepcopy
-from gmapi.data_management.datablock_list import DatablockList
-from gmapi.gmap import run_gmap_simplified
-from gmapi.data_management.database_IO import (read_json_gma_database,
+from gmapy.data_management.datablock_list import DatablockList
+from gmapy.gmap import run_gmap_simplified
+from gmapy.data_management.database_IO import (read_json_gma_database,
         read_legacy_gma_database)
 
 from utils.convenience_funs import (get_sacs_predictions,

diff --git a/examples/standard_studies/analysis_001/analysis_after_2017_mannhart_sacs.py b/examples/standard_studies/analysis_001/analysis_after_2017_mannhart_sacs.py
@@ -3,9 +3,9 @@
 sys.path.append('../..')
 sys.path.append('../../..')
 from copy import deepcopy
-from gmapi.data_management.datablock_list import DatablockList
-from gmapi.gmap import run_gmap_simplified
-from gmapi.data_management.database_IO import (read_json_gma_database,
+from gmapy.data_management.datablock_list import DatablockList
+from gmapy.gmap import run_gmap_simplified
+from gmapy.data_management.database_IO import (read_json_gma_database,
         read_legacy_gma_database)
 
 from utils.convenience_funs import (get_sacs_predictions,

diff --git a/examples/standard_studies/analysis_001/analysis_after_2017_no_sacs.py b/examples/standard_studies/analysis_001/analysis_after_2017_no_sacs.py
@@ -3,9 +3,9 @@
 sys.path.append('../..')
 sys.path.append('../../..')
 from copy import deepcopy
-from gmapi.data_management.datablock_list import DatablockList
-from gmapi.gmap import run_gmap_simplified
-from gmapi.data_management.database_IO import (read_json_gma_database,
+from gmapy.data_management.datablock_list import DatablockList
+from gmapy.gmap import run_gmap_simplified
+from gmapy.data_management.database_IO import (read_json_gma_database,
         read_legacy_gma_database)
 
 from utils.convenience_funs import (get_sacs_predictions,

diff --git a/examples/standard_studies/analysis_001/analysis_standard_2017_no_sacs.py b/examples/standard_studies/analysis_001/analysis_standard_2017_no_sacs.py
@@ -3,9 +3,9 @@
 sys.path.append('../..')
 sys.path.append('../../..')
 from copy import deepcopy
-from gmapi.data_management.datablock_list import DatablockList
-from gmapi.gmap import run_gmap_simplified
-from gmapi.data_management.database_IO import (read_json_gma_database,
+from gmapy.data_management.datablock_list import DatablockList
+from gmapy.gmap import run_gmap_simplified
+from gmapy.data_management.database_IO import (read_json_gma_database,
         read_legacy_gma_database)
 
 from utils.convenience_funs import (get_sacs_predictions,

diff --git a/examples/standard_studies/analysis_001/analysis_standards_2017.py b/examples/standard_studies/analysis_001/analysis_standards_2017.py
@@ -3,9 +3,9 @@
 sys.path.append('../..')
 sys.path.append('../../..')
 from copy import deepcopy
-from gmapi.data_management.datablock_list import DatablockList
-from gmapi.gmap import run_gmap_simplified
-from gmapi.data_management.database_IO import (read_json_gma_database,
+from gmapy.data_management.datablock_list import DatablockList
+from gmapy.gmap import run_gmap_simplified
+from gmapy.data_management.database_IO import (read_json_gma_database,
         read_legacy_gma_database)
 
 from utils.convenience_funs import (get_sacs_predictions,

diff --git a/examples/standard_studies/analysis_001/analysis_standards_2017_mannhart_sacs.py b/examples/standard_studies/analysis_001/analysis_standards_2017_mannhart_sacs.py
@@ -3,9 +3,9 @@
 sys.path.append('../..')
 sys.path.append('../../..')
 from copy import deepcopy
-from gmapi.data_management.datablock_list import DatablockList
-from gmapi.gmap import run_gmap_simplified
-from gmapi.data_management.database_IO import (read_json_gma_database,
+from gmapy.data_management.datablock_list import DatablockList
+from gmapy.gmap import run_gmap_simplified
+from gmapy.data_management.database_IO import (read_json_gma_database,
         read_legacy_gma_database)
 
 from utils.convenience_funs import (get_sacs_predictions,

diff --git a/examples/standard_studies/analysis_002/gmap_fit_2017.py b/examples/standard_studies/analysis_002/gmap_fit_2017.py
@@ -3,9 +3,9 @@
 sys.path.append('../..')
 sys.path.append('../../..')
 from copy import deepcopy
-from gmapi.data_management.datablock_list import DatablockList
-from gmapi.gmap import run_gmap_simplified
-from gmapi.data_management.database_IO import (read_json_gma_database,
+from gmapy.data_management.datablock_list import DatablockList
+from gmapy.gmap import run_gmap_simplified
+from gmapy.data_management.database_IO import (read_json_gma_database,
         read_legacy_gma_database)
 
 from utils.convenience_funs import (get_sacs_predictions,

diff --git a/examples/standard_studies/analysis_002/gmap_fit_latest.py b/examples/standard_studies/analysis_002/gmap_fit_latest.py
@@ -3,9 +3,9 @@
 sys.path.append('../..')
 sys.path.append('../../..')
 from copy import deepcopy
-from gmapi.data_management.datablock_list import DatablockList
-from gmapi.gmap import run_gmap_simplified
-from gmapi.data_management.database_IO import (read_json_gma_database,
+from gmapy.data_management.datablock_list import DatablockList
+from gmapy.gmap import run_gmap_simplified
+from gmapy.data_management.database_IO import (read_json_gma_database,
         read_legacy_gma_database)
 
 from utils.convenience_funs import (get_sacs_predictions,

diff --git a/examples/standard_studies/analysis_002/gmap_fit_modified.py b/examples/standard_studies/analysis_002/gmap_fit_modified.py
@@ -3,9 +3,9 @@
 sys.path.append('../..')
 sys.path.append('../../..')
 from copy import deepcopy
-from gmapi.data_management.datablock_list import DatablockList
-from gmapi.gmap import run_gmap_simplified
-from gmapi.data_management.database_IO import (read_json_gma_database,
+from gmapy.data_management.datablock_list import DatablockList
+from gmapy.gmap import run_gmap_simplified
+from gmapy.data_management.database_IO import (read_json_gma_database,
         read_legacy_gma_database)
 
 from utils.convenience_funs import (get_sacs_predictions,

diff --git a/examples/standard_studies/utils/convenience_funs.py b/examples/standard_studies/utils/convenience_funs.py
@@ -4,10 +4,10 @@
 from copy import deepcopy
 import pandas as pd
 import numpy as np
-from gmapi.data_management.dataset import Dataset
-from gmapi.data_management.datablock import Datablock
-from gmapi.data_management.datablock_list import DatablockList
-from gmapi.mappings.compound_map import CompoundMap
+from gmapy.data_management.dataset import Dataset
+from gmapy.data_management.datablock import Datablock
+from gmapy.data_management.datablock_list import DatablockList
+from gmapy.mappings.compound_map import CompoundMap
 import json
 
 

diff --git a/examples/standard_studies/utils/r_adapter.py b/examples/standard_studies/utils/r_adapter.py
@@ -2,7 +2,7 @@
 sys.path.append('..')
 sys.path.append('../..')
 sys.path.append('../../..')
-from gmapi.mappings.compound_map import CompoundMap
+from gmapy.mappings.compound_map import CompoundMap
 import numpy as np
 import pandas as pd
 

diff --git a/gmapi/__init__.py → gmapy/__init__.py b/gmapi/__init__.py → gmapy/__init__.py
diff --git a/gmapi/data_management/__init__.py → gmapy/data_management/__init__.py b/gmapi/data_management/__init__.py → gmapy/data_management/__init__.py
diff --git a/gmapi/data_management/database_IO.py → gmapy/data_management/database_IO.py b/gmapi/data_management/database_IO.py → gmapy/data_management/database_IO.py
diff --git a/gmapi/data_management/datablock.py → gmapy/data_management/datablock.py b/gmapi/data_management/datablock.py → gmapy/data_management/datablock.py
diff --git a/gmapi/data_management/datablock_list.py → gmapy/data_management/datablock_list.py b/gmapi/data_management/datablock_list.py → gmapy/data_management/datablock_list.py
diff --git a/gmapi/data_management/dataset.py → gmapy/data_management/dataset.py b/gmapi/data_management/dataset.py → gmapy/data_management/dataset.py
diff --git a/.../specialized_uncertainty_funs/__init__.py → .../specialized_uncertainty_funs/__init__.py b/.../specialized_uncertainty_funs/__init__.py → .../specialized_uncertainty_funs/__init__.py
diff --git a/...certainty_funs/legacy_uncertainty_funs.py → ...certainty_funs/legacy_uncertainty_funs.py b/...certainty_funs/legacy_uncertainty_funs.py → ...certainty_funs/legacy_uncertainty_funs.py
diff --git a/...certainty_funs/simple_uncertainty_funs.py → ...certainty_funs/simple_uncertainty_funs.py b/...certainty_funs/simple_uncertainty_funs.py → ...certainty_funs/simple_uncertainty_funs.py
diff --git a/gmapi/data_management/tablefuns.py → gmapy/data_management/tablefuns.py b/gmapi/data_management/tablefuns.py → gmapy/data_management/tablefuns.py
diff --git a/gmapi/data_management/unc_utils.py → gmapy/data_management/unc_utils.py b/gmapi/data_management/unc_utils.py → gmapy/data_management/unc_utils.py
diff --git a/gmapi/data_management/uncfuns.py → gmapy/data_management/uncfuns.py b/gmapi/data_management/uncfuns.py → gmapy/data_management/uncfuns.py
diff --git a/gmapi/gma_database_class.py → gmapy/gma_database_class.py b/gmapi/gma_database_class.py → gmapy/gma_database_class.py
diff --git a/gmapi/gma_database_usu_class.py → gmapy/gma_database_usu_class.py b/gmapi/gma_database_usu_class.py → gmapy/gma_database_usu_class.py
diff --git a/gmapi/gmap.py → gmapy/gmap.py b/gmapi/gmap.py → gmapy/gmap.py
diff --git a/gmapi/inference.py → gmapy/inference.py b/gmapi/inference.py → gmapy/inference.py
diff --git a/gmapi/legacy/__init__.py → gmapy/legacy/__init__.py b/gmapi/legacy/__init__.py → gmapy/legacy/__init__.py
diff --git a/gmapi/legacy/conversion_utils.py → gmapy/legacy/conversion_utils.py b/gmapi/legacy/conversion_utils.py → gmapy/legacy/conversion_utils.py
diff --git a/gmapi/legacy/data_extraction_functions.py → gmapy/legacy/data_extraction_functions.py b/gmapi/legacy/data_extraction_functions.py → gmapy/legacy/data_extraction_functions.py
diff --git a/gmapi/legacy/data_management.py → gmapy/legacy/data_management.py b/gmapi/legacy/data_management.py → gmapy/legacy/data_management.py
diff --git a/gmapi/legacy/database_reading.py → gmapy/legacy/database_reading.py b/gmapi/legacy/database_reading.py → gmapy/legacy/database_reading.py
diff --git a/gmapi/legacy/database_reading_utils.py → gmapy/legacy/database_reading_utils.py b/gmapi/legacy/database_reading_utils.py → gmapy/legacy/database_reading_utils.py
diff --git a/gmapi/legacy/fortran_utils.py → gmapy/legacy/fortran_utils.py b/gmapi/legacy/fortran_utils.py → gmapy/legacy/fortran_utils.py
diff --git a/gmapi/legacy/generic_utils.py → gmapy/legacy/generic_utils.py b/gmapi/legacy/generic_utils.py → gmapy/legacy/generic_utils.py
diff --git a/gmapi/legacy/gmap_functions.py → gmapy/legacy/gmap_functions.py b/gmapi/legacy/gmap_functions.py → gmapy/legacy/gmap_functions.py
diff --git a/gmapi/legacy/gmap_snippets.py → gmapy/legacy/gmap_snippets.py b/gmapi/legacy/gmap_snippets.py → gmapy/legacy/gmap_snippets.py
diff --git a/gmapi/legacy/inference.py → gmapy/legacy/inference.py b/gmapi/legacy/inference.py → gmapy/legacy/inference.py
diff --git a/gmapi/legacy/legacy_gmap.py → gmapy/legacy/legacy_gmap.py b/gmapi/legacy/legacy_gmap.py → gmapy/legacy/legacy_gmap.py
diff --git a/gmapi/legacy/legacy_maps.py → gmapy/legacy/legacy_maps.py b/gmapi/legacy/legacy_maps.py → gmapy/legacy/legacy_maps.py
diff --git a/gmapi/legacy/linpack_utils.py → gmapy/legacy/linpack_utils.py b/gmapi/legacy/linpack_utils.py → gmapy/legacy/linpack_utils.py
diff --git a/gmapi/legacy/output_management.py → gmapy/legacy/output_management.py b/gmapi/legacy/output_management.py → gmapy/legacy/output_management.py
diff --git a/gmapi/mappings/__init__.py → gmapy/mappings/__init__.py b/gmapi/mappings/__init__.py → gmapy/mappings/__init__.py
diff --git a/gmapi/mappings/basic_integral_maps.py → gmapy/mappings/basic_integral_maps.py b/gmapi/mappings/basic_integral_maps.py → gmapy/mappings/basic_integral_maps.py
diff --git a/gmapi/mappings/basic_maps.py → gmapy/mappings/basic_maps.py b/gmapi/mappings/basic_maps.py → gmapy/mappings/basic_maps.py
diff --git a/gmapi/mappings/compound_map.py → gmapy/mappings/compound_map.py b/gmapi/mappings/compound_map.py → gmapy/mappings/compound_map.py
diff --git a/...pings/cross_section_absolute_ratio_map.py → ...pings/cross_section_absolute_ratio_map.py b/...pings/cross_section_absolute_ratio_map.py → ...pings/cross_section_absolute_ratio_map.py
diff --git a/...ings/cross_section_fission_average_map.py → ...ings/cross_section_fission_average_map.py b/...ings/cross_section_fission_average_map.py → ...ings/cross_section_fission_average_map.py
diff --git a/gmapi/mappings/cross_section_map.py → gmapy/mappings/cross_section_map.py b/gmapi/mappings/cross_section_map.py → gmapy/mappings/cross_section_map.py
diff --git a/gmapi/mappings/cross_section_ratio_map.py → gmapy/mappings/cross_section_ratio_map.py b/gmapi/mappings/cross_section_ratio_map.py → gmapy/mappings/cross_section_ratio_map.py
diff --git a/...ppings/cross_section_ratio_of_sacs_map.py → ...ppings/cross_section_ratio_of_sacs_map.py b/...ppings/cross_section_ratio_of_sacs_map.py → ...ppings/cross_section_ratio_of_sacs_map.py
diff --git a/...mappings/cross_section_ratio_shape_map.py → ...mappings/cross_section_ratio_shape_map.py b/...mappings/cross_section_ratio_shape_map.py → ...mappings/cross_section_ratio_shape_map.py
diff --git a/gmapi/mappings/cross_section_shape_map.py → gmapy/mappings/cross_section_shape_map.py b/gmapi/mappings/cross_section_shape_map.py → gmapy/mappings/cross_section_shape_map.py
diff --git a/...pings/cross_section_shape_of_ratio_map.py → ...pings/cross_section_shape_of_ratio_map.py b/...pings/cross_section_shape_of_ratio_map.py → ...pings/cross_section_shape_of_ratio_map.py
diff --git a/...appings/cross_section_shape_of_sum_map.py → ...appings/cross_section_shape_of_sum_map.py b/...appings/cross_section_shape_of_sum_map.py → ...appings/cross_section_shape_of_sum_map.py
diff --git a/gmapi/mappings/cross_section_total_map.py → gmapy/mappings/cross_section_total_map.py b/gmapi/mappings/cross_section_total_map.py → gmapy/mappings/cross_section_total_map.py
diff --git a/gmapi/mappings/helperfuns/__init__.py → gmapy/mappings/helperfuns/__init__.py b/gmapi/mappings/helperfuns/__init__.py → gmapy/mappings/helperfuns/__init__.py
diff --git a/gmapi/mappings/helperfuns/helperfuns.py → gmapy/mappings/helperfuns/helperfuns.py b/gmapi/mappings/helperfuns/helperfuns.py → gmapy/mappings/helperfuns/helperfuns.py
diff --git a/...i/mappings/helperfuns/numeric_jacobian.py → ...y/mappings/helperfuns/numeric_jacobian.py b/...i/mappings/helperfuns/numeric_jacobian.py → ...y/mappings/helperfuns/numeric_jacobian.py
diff --git a/...appings/helperfuns/romberg_integration.py → ...appings/helperfuns/romberg_integration.py b/...appings/helperfuns/romberg_integration.py → ...appings/helperfuns/romberg_integration.py
diff --git a/gmapi/mappings/priortools.py → gmapy/mappings/priortools.py b/gmapi/mappings/priortools.py → gmapy/mappings/priortools.py
diff --git a/gmapi/mappings/usu_error_map.py → gmapy/mappings/usu_error_map.py b/gmapi/mappings/usu_error_map.py → gmapy/mappings/usu_error_map.py
diff --git a/gmapi/optimization_auxfuns.py → gmapy/optimization_auxfuns.py b/gmapi/optimization_auxfuns.py → gmapy/optimization_auxfuns.py
diff --git a/legacy-tests/test_001/run_test.sh b/legacy-tests/test_001/run_test.sh
@@ -67,7 +67,7 @@ cd result/python/
 PYTHONPATH="$GMAP_python_dir"
 python -c '
 import pandas as pd
-from gmapi.legacy.legacy_gmap import run_gmap;
+from gmapy.legacy.legacy_gmap import run_gmap;
 res = run_gmap(dbfile="data.gma", dbtype="legacy",
                fix_ppp_bug=False, fix_sacs_jacobian=False,
                legacy_output=True)

diff --git a/legacy-tests/test_002/run_test.sh b/legacy-tests/test_002/run_test.sh
@@ -67,7 +67,7 @@ cd result/python/
 PYTHONPATH="$GMAP_python_dir"
 python -c '
 import pandas as pd
-from gmapi.legacy.legacy_gmap import run_gmap;
+from gmapy.legacy.legacy_gmap import run_gmap;
 res = run_gmap(dbfile="gmadata.json", dbtype="json",
                fix_ppp_bug=False, fix_sacs_jacobian=False,
                legacy_output=True)

diff --git a/legacy-tests/test_003/run_test.sh b/legacy-tests/test_003/run_test.sh
@@ -67,7 +67,7 @@ cd result/python/
 PYTHONPATH="$GMAP_python_dir"
 python -c '
 import pandas as pd
-from gmapi.legacy.legacy_gmap import run_gmap;
+from gmapy.legacy.legacy_gmap import run_gmap;
 res = run_gmap(dbfile="gmadata.json", dbtype="json",
                fix_ppp_bug=False, fix_sacs_jacobian=False,
                legacy_output=True)

diff --git a/legacy-tests/test_004/run_test.sh b/legacy-tests/test_004/run_test.sh
@@ -67,7 +67,7 @@ cd result/python/
 PYTHONPATH="$GMAP_python_dir"
 python -c '
 import pandas as pd
-from gmapi.legacy.legacy_gmap import run_gmap;
+from gmapy.legacy.legacy_gmap import run_gmap;
 res = run_gmap(dbfile="data.gma", dbtype="legacy",
                fix_ppp_bug=False, fix_sacs_jacobian=False,
                legacy_output=True)

diff --git a/legacy-tests/test_005/run_test.sh b/legacy-tests/test_005/run_test.sh
@@ -67,7 +67,7 @@ cd result/python/
 PYTHONPATH="$GMAP_python_dir"
 python -c '
 import pandas as pd
-from gmapi.legacy.legacy_gmap import run_gmap;
+from gmapy.legacy.legacy_gmap import run_gmap;
 res = run_gmap(dbfile="gmadata.json", dbtype="json", correct_ppp=False,
                fix_sacs_jacobian=False, legacy_output=True)
 res["table"].to_csv("restable.csv", sep=";")

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "gmapi"
+name = "gmapy"
 version = "0.13"
 description = "package to evaluate cross sections"
 authors = ["Georg Schnabel"]
@@ -14,7 +14,6 @@ scipy = "^1.9.1"
 fortranformat = "^1.2.2"
 scikit-sparse = "^0.4.6"
 
-
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.1.3"
 openpyxl = "^3.0.10"

diff --git a/tests/test_basic_integral_mappings.py b/tests/test_basic_integral_mappings.py
@@ -1,8 +1,8 @@
 import unittest
 import numpy as np
-from gmapi.mappings.basic_integral_maps import (basic_integral_propagate,
+from gmapy.mappings.basic_integral_maps import (basic_integral_propagate,
                                                 get_basic_integral_sensmat)
-from gmapi.mappings.helperfuns import numeric_jacobian
+from gmapy.mappings.helperfuns import numeric_jacobian
 
 
 class TestBasicIntegralMapping(unittest.TestCase):

diff --git a/tests/test_basic_integral_of_product_mappings.py b/tests/test_basic_integral_of_product_mappings.py
@@ -1,10 +1,10 @@
 import unittest
 import numpy as np
-from gmapi.mappings.basic_maps import basic_propagate
-from gmapi.mappings.basic_integral_maps import (
+from gmapy.mappings.basic_maps import basic_propagate
+from gmapy.mappings.basic_integral_maps import (
         basic_integral_of_product_propagate,
         get_basic_integral_of_product_sensmats)
-from gmapi.mappings.helperfuns import numeric_jacobian, compute_romberg_integral
+from gmapy.mappings.helperfuns import numeric_jacobian, compute_romberg_integral
 
 
 class TestBasicIntegralOfProductMapping(unittest.TestCase):

diff --git a/tests/test_basic_mappings.py b/tests/test_basic_mappings.py
@@ -1,9 +1,9 @@
 import unittest
 import numpy as np
 from scipy.sparse import csr_matrix
-from gmapi.mappings.basic_maps import (basic_propagate, get_basic_sensmat,
+from gmapy.mappings.basic_maps import (basic_propagate, get_basic_sensmat,
         basic_multiply_Sdic_rows, basic_extract_Sdic_coeffs)
-from gmapi.mappings.helperfuns import numeric_jacobian, return_matrix
+from gmapy.mappings.helperfuns import numeric_jacobian, return_matrix
 
 
 class TestBasicMappingsPropagation(unittest.TestCase):

diff --git a/tests/test_basic_product_mapping.py b/tests/test_basic_product_mapping.py
@@ -1,8 +1,8 @@
 import unittest
 import numpy as np
-from gmapi.mappings.basic_maps import (basic_propagate, basic_product_propagate,
+from gmapy.mappings.basic_maps import (basic_propagate, basic_product_propagate,
         get_basic_product_sensmats)
-from gmapi.mappings.helperfuns import numeric_jacobian
+from gmapy.mappings.helperfuns import numeric_jacobian
 
 
 class TestBasicProductPropagate(unittest.TestCase):

diff --git a/tests/test_conversions.py b/tests/test_conversions.py
@@ -3,9 +3,9 @@
 from tempfile import TemporaryDirectory
 import numpy as np
 
-from gmapi.legacy.legacy_gmap import run_gmap
-from gmapi.legacy.database_reading import read_gma_database
-from gmapi.legacy.conversion_utils import (sanitize_datablock,
+from gmapy.legacy.legacy_gmap import run_gmap
+from gmapy.legacy.database_reading import read_gma_database
+from gmapy.legacy.conversion_utils import (sanitize_datablock,
         desanitize_datablock, compare_legacy_datablock_lists,
         augment_datablocks_with_NTOT, sanitize_prior,
         desanitize_prior, convert_GMA_database_to_JSON)

diff --git a/tests/test_gma_database_class.py b/tests/test_gma_database_class.py
@@ -1,7 +1,7 @@
 import unittest
 import pathlib
 import pandas as pd
-from gmapi.gma_database_class import GMADatabase
+from gmapy.gma_database_class import GMADatabase
 import numpy as np
 from copy import deepcopy
 from scipy.sparse import csr_matrix

diff --git a/tests/test_gma_database_usu_class.py b/tests/test_gma_database_usu_class.py
@@ -1,14 +1,14 @@
 import unittest
 import pathlib
 import pandas as pd
-from gmapi.gma_database_usu_class import GMADatabaseUSU
+from gmapy.gma_database_usu_class import GMADatabaseUSU
 import numpy as np
 from copy import deepcopy
 from scipy.sparse import csr_matrix
 from sksparse.cholmod import cholesky
-from gmapi.mappings.helperfuns import numeric_jacobian
+from gmapy.mappings.helperfuns import numeric_jacobian
 
-from gmapi.optimization_auxfuns import create_posterior_funs
+from gmapy.optimization_auxfuns import create_posterior_funs
 
 
 # NOTE: This test case tests at present tests mostly the functionality

diff --git a/tests/test_gmap_simplified.py b/tests/test_gmap_simplified.py
@@ -2,8 +2,8 @@
 import pathlib
 import numpy as np
 from pandas.testing import assert_frame_equal
-from gmapi.gmap import run_gmap_simplified
-from gmapi.legacy.legacy_gmap import run_gmap
+from gmapy.gmap import run_gmap_simplified
+from gmapy.legacy.legacy_gmap import run_gmap
 
 
 class TestGmapSimplified(unittest.TestCase):

diff --git a/tests/test_inference.py b/tests/test_inference.py
@@ -4,15 +4,15 @@
 import pandas as pd
 from scipy.sparse import coo_matrix, csr_matrix
 
-from gmapi.legacy.database_reading import read_gma_database
-from gmapi.legacy.conversion_utils import (sanitize_datablock, sanitize_prior)
-from gmapi.data_management.uncfuns import (create_relunc_vector,
+from gmapy.legacy.database_reading import read_gma_database
+from gmapy.legacy.conversion_utils import (sanitize_datablock, sanitize_prior)
+from gmapy.data_management.uncfuns import (create_relunc_vector,
         create_experimental_covmat)
-from gmapi.data_management.tablefuns import (create_prior_table,
+from gmapy.data_management.tablefuns import (create_prior_table,
         create_experiment_table)
-from gmapi.mappings.priortools import attach_shape_prior
-from gmapi.inference import gls_update
-from gmapi.mappings.compound_map import CompoundMap
+from gmapy.mappings.priortools import attach_shape_prior
+from gmapy.inference import gls_update
+from gmapy.mappings.compound_map import CompoundMap
 
 
 class TestInference(unittest.TestCase):