Issue #22, let's go with spinedb_api

spine-tools · Mar 26, 2019 · f53358e · f53358e
1 parent a9c5eda
commit f53358e
Show file tree

Hide file tree

Showing 20 changed files with 13 additions and 13 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-recursive-include spine_dbapi/alembic/versions *.py
+recursive-include spinedb_api/alembic/versions *.py
diff --git a/setup.py b/setup.py
@@ -1,11 +1,11 @@
 from setuptools import setup, find_packages
 
 version = {}
-with open("spine_dbapi/version.py") as fp:
+with open("spinedb_api/version.py") as fp:
     exec(fp.read(), version)
 
 setup(
-    name='spine_dbapi',
+    name='spinedb_api',
     version=version['__version__'],
     description='An API to talk to Spine databases',
     url='https://github.com/Spine-project/Spine-Database-API',

diff --git a/spine_dbapi/__init__.py → spinedb_api/__init__.py b/spine_dbapi/__init__.py → spinedb_api/__init__.py
diff --git a/spine_dbapi/alembic.ini → spinedb_api/alembic.ini b/spine_dbapi/alembic.ini → spinedb_api/alembic.ini
diff --git a/spine_dbapi/alembic/README → spinedb_api/alembic/README b/spine_dbapi/alembic/README → spinedb_api/alembic/README
diff --git a/spine_dbapi/alembic/env.py → spinedb_api/alembic/env.py b/spine_dbapi/alembic/env.py → spinedb_api/alembic/env.py
diff --git a/spine_dbapi/alembic/script.py.mako → spinedb_api/alembic/script.py.mako b/spine_dbapi/alembic/script.py.mako → spinedb_api/alembic/script.py.mako
diff --git a/...parameter_tag_and_parameter_value_list.py → ...parameter_tag_and_parameter_value_list.py b/...parameter_tag_and_parameter_value_list.py → ...parameter_tag_and_parameter_value_list.py
diff --git a/...name_parameter_to_parameter_definition.py → ...name_parameter_to_parameter_definition.py b/...name_parameter_to_parameter_definition.py → ...name_parameter_to_parameter_definition.py
diff --git a/spine_dbapi/database_mapping.py → spinedb_api/database_mapping.py b/spine_dbapi/database_mapping.py → spinedb_api/database_mapping.py
diff --git a/spine_dbapi/diff_database_mapping.py → spinedb_api/diff_database_mapping.py b/spine_dbapi/diff_database_mapping.py → spinedb_api/diff_database_mapping.py
diff --git a/spine_dbapi/exception.py → spinedb_api/exception.py b/spine_dbapi/exception.py → spinedb_api/exception.py
diff --git a/spine_dbapi/helpers.py → spinedb_api/helpers.py b/spine_dbapi/helpers.py → spinedb_api/helpers.py
diff --git a/spine_dbapi/import_functions.py → spinedb_api/import_functions.py b/spine_dbapi/import_functions.py → spinedb_api/import_functions.py
diff --git a/spine_dbapi/json_mapping.py → spinedb_api/json_mapping.py b/spine_dbapi/json_mapping.py → spinedb_api/json_mapping.py
diff --git a/spine_dbapi/version.py → spinedb_api/version.py b/spine_dbapi/version.py → spinedb_api/version.py
diff --git a/test/test_DiffDatabaseMapping.py b/test/test_DiffDatabaseMapping.py
@@ -20,8 +20,8 @@
 import unittest
 import logging
 import sys
-from spine_dbapi.diff_database_mapping import DiffDatabaseMapping, SpineIntegrityError
-from spine_dbapi.helpers import create_new_spine_database
+from spinedb_api.diff_database_mapping import DiffDatabaseMapping, SpineIntegrityError
+from spinedb_api.helpers import create_new_spine_database
 from sqlalchemy.util import KeyedTuple
 from unittest import mock
 from sqlalchemy.orm import Session

diff --git a/test/test_database_mapping.py b/test/test_database_mapping.py
@@ -16,10 +16,10 @@
 :date:   29.11.2018
 """
 
-from spine_dbapi.diff_database_mapping import DiffDatabaseMapping
+from spinedb_api.diff_database_mapping import DiffDatabaseMapping
 from sqlalchemy import inspect, MetaData
-from spine_dbapi.helpers import create_new_spine_database
-from spine_dbapi import DatabaseMapping
+from spinedb_api.helpers import create_new_spine_database
+from spinedb_api import DatabaseMapping
 import unittest
 from faker import Faker
 import random

diff --git a/test/test_import_functions.py b/test/test_import_functions.py
@@ -16,17 +16,17 @@
 :date:   17.12.2018
 """
 #import sys
-#sys.path.append('/spine_dbapi')
+#sys.path.append('/spinedb_api')
 
 
 import unittest
 from collections import namedtuple
 from unittest.mock import MagicMock
 import os
 
-from spine_dbapi.diff_database_mapping import DiffDatabaseMapping
-from spine_dbapi.helpers import create_new_spine_database
-from spine_dbapi.import_functions import (import_object_classes,
+from spinedb_api.diff_database_mapping import DiffDatabaseMapping
+from spinedb_api.helpers import create_new_spine_database
+from spinedb_api.import_functions import (import_object_classes,
                               import_object_parameter_values,
                               import_object_parameters, import_objects,
                               import_relationship_classes,

diff --git a/test/test_json_mapping.py b/test/test_json_mapping.py
@@ -18,7 +18,7 @@
 
 import unittest
 from unittest.mock import MagicMock
-from spine_dbapi.json_mapping import read_with_mapping
+from spinedb_api.json_mapping import read_with_mapping
 
 
 class TestMappingIntegration(unittest.TestCase):