diff --git a/MANIFEST.in b/MANIFEST.in index b1fed256..6d17bb6c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1 @@ -recursive-include spinedatabase_api/alembic/versions *.py +recursive-include spine_dbapi/alembic/versions *.py diff --git a/setup.py b/setup.py index e8b0c5cc..c3ddf9b2 100644 --- a/setup.py +++ b/setup.py @@ -1,11 +1,11 @@ from setuptools import setup, find_packages version = {} -with open("spinedatabase_api/version.py") as fp: +with open("spine_dbapi/version.py") as fp: exec(fp.read(), version) setup( - name='spinedatabase_api', + name='spine_dbapi', version=version['__version__'], description='An API to talk to Spine databases', url='https://github.com/Spine-project/Spine-Database-API', diff --git a/spinedatabase_api/__init__.py b/spine_dbapi/__init__.py similarity index 100% rename from spinedatabase_api/__init__.py rename to spine_dbapi/__init__.py diff --git a/spinedatabase_api/alembic.ini b/spine_dbapi/alembic.ini similarity index 100% rename from spinedatabase_api/alembic.ini rename to spine_dbapi/alembic.ini diff --git a/spinedatabase_api/alembic/README b/spine_dbapi/alembic/README similarity index 100% rename from spinedatabase_api/alembic/README rename to spine_dbapi/alembic/README diff --git a/spinedatabase_api/alembic/env.py b/spine_dbapi/alembic/env.py similarity index 100% rename from spinedatabase_api/alembic/env.py rename to spine_dbapi/alembic/env.py diff --git a/spinedatabase_api/alembic/script.py.mako b/spine_dbapi/alembic/script.py.mako similarity index 100% rename from spinedatabase_api/alembic/script.py.mako rename to spine_dbapi/alembic/script.py.mako diff --git a/spinedatabase_api/alembic/versions/51fd7b69acf7_add_parameter_tag_and_parameter_value_list.py b/spine_dbapi/alembic/versions/51fd7b69acf7_add_parameter_tag_and_parameter_value_list.py similarity index 100% rename from spinedatabase_api/alembic/versions/51fd7b69acf7_add_parameter_tag_and_parameter_value_list.py rename to spine_dbapi/alembic/versions/51fd7b69acf7_add_parameter_tag_and_parameter_value_list.py diff --git a/spinedatabase_api/alembic/versions/8c19c53d5701_rename_parameter_to_parameter_definition.py b/spine_dbapi/alembic/versions/8c19c53d5701_rename_parameter_to_parameter_definition.py similarity index 100% rename from spinedatabase_api/alembic/versions/8c19c53d5701_rename_parameter_to_parameter_definition.py rename to spine_dbapi/alembic/versions/8c19c53d5701_rename_parameter_to_parameter_definition.py diff --git a/spinedatabase_api/database_mapping.py b/spine_dbapi/database_mapping.py similarity index 100% rename from spinedatabase_api/database_mapping.py rename to spine_dbapi/database_mapping.py diff --git a/spinedatabase_api/diff_database_mapping.py b/spine_dbapi/diff_database_mapping.py similarity index 100% rename from spinedatabase_api/diff_database_mapping.py rename to spine_dbapi/diff_database_mapping.py diff --git a/spinedatabase_api/exception.py b/spine_dbapi/exception.py similarity index 100% rename from spinedatabase_api/exception.py rename to spine_dbapi/exception.py diff --git a/spinedatabase_api/helpers.py b/spine_dbapi/helpers.py similarity index 100% rename from spinedatabase_api/helpers.py rename to spine_dbapi/helpers.py diff --git a/spinedatabase_api/import_functions.py b/spine_dbapi/import_functions.py similarity index 100% rename from spinedatabase_api/import_functions.py rename to spine_dbapi/import_functions.py diff --git a/spinedatabase_api/json_mapping.py b/spine_dbapi/json_mapping.py similarity index 100% rename from spinedatabase_api/json_mapping.py rename to spine_dbapi/json_mapping.py diff --git a/spinedatabase_api/version.py b/spine_dbapi/version.py similarity index 100% rename from spinedatabase_api/version.py rename to spine_dbapi/version.py diff --git a/test/test_DiffDatabaseMapping.py b/test/test_DiffDatabaseMapping.py index 045b2c71..c81b1b49 100644 --- a/test/test_DiffDatabaseMapping.py +++ b/test/test_DiffDatabaseMapping.py @@ -20,8 +20,8 @@ import unittest import logging import sys -from spinedatabase_api.diff_database_mapping import DiffDatabaseMapping, SpineIntegrityError -from spinedatabase_api.helpers import create_new_spine_database +from spine_dbapi.diff_database_mapping import DiffDatabaseMapping, SpineIntegrityError +from spine_dbapi.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 index 9bf6ee36..edff6cef 100644 --- a/test/test_database_mapping.py +++ b/test/test_database_mapping.py @@ -16,10 +16,10 @@ :date: 29.11.2018 """ -from spinedatabase_api.diff_database_mapping import DiffDatabaseMapping +from spine_dbapi.diff_database_mapping import DiffDatabaseMapping from sqlalchemy import inspect, MetaData -from spinedatabase_api.helpers import create_new_spine_database -from spinedatabase_api import DatabaseMapping +from spine_dbapi.helpers import create_new_spine_database +from spine_dbapi import DatabaseMapping import unittest from faker import Faker import random diff --git a/test/test_import_functions.py b/test/test_import_functions.py index 2d78b6ab..d2a8346c 100644 --- a/test/test_import_functions.py +++ b/test/test_import_functions.py @@ -16,7 +16,7 @@ :date: 17.12.2018 """ #import sys -#sys.path.append('/spinedatabase_api') +#sys.path.append('/spine_dbapi') import unittest @@ -24,9 +24,9 @@ from unittest.mock import MagicMock import os -from spinedatabase_api.diff_database_mapping import DiffDatabaseMapping -from spinedatabase_api.helpers import create_new_spine_database -from spinedatabase_api.import_functions import (import_object_classes, +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, 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 index 865bcac8..b497d7da 100644 --- a/test/test_json_mapping.py +++ b/test/test_json_mapping.py @@ -18,7 +18,7 @@ import unittest from unittest.mock import MagicMock -from spinedatabase_api.json_mapping import read_with_mapping +from spine_dbapi.json_mapping import read_with_mapping class TestMappingIntegration(unittest.TestCase): @@ -32,7 +32,7 @@ def setUp(self): 'relationships': [], 'relationship_parameters': [], 'relationship_parameter_values': []} - + def test_read_flat_file(self): input_data = [['object_class','object','parameter','value'], ['oc1','obj1','parameter_name1',1], @@ -42,11 +42,11 @@ def test_read_flat_file(self): 'object_parameters': [('oc1','parameter_name1'), ('oc2','parameter_name2')], 'object_parameter_values': [('oc1','obj1','parameter_name1','value',1), ('oc2','obj2','parameter_name2','value',2)]}) - + data = iter(input_data) data_header = next(data) num_cols = len(data_header) - + mapping = {'map_type':'ObjectClass', 'name': 0, 'object': 1, @@ -57,18 +57,18 @@ def test_read_flat_file(self): out, errors = read_with_mapping(data, mapping, num_cols, data_header) self.assertEqual(out, self.empty_data) self.assertEqual(errors, []) - + def test_read_flat_file_with_column_name_reference(self): input_data = [['object','parameter','value'], ['obj1','parameter_name1',1], ['obj2','parameter_name2',2]] self.empty_data.update({'object_classes': ['object'], 'objects': [('object','obj1'), ('object','obj2')]}) - + data = iter(input_data) data_header = next(data) num_cols = len(data_header) - + mapping = {'map_type': 'ObjectClass', 'name': {'map_type':'column_name','value_reference': 0}, 'object': 0} @@ -88,11 +88,11 @@ def test_read_columncollection_parameters(self): ('object','obj1','parameter_name2','value',1), ('object','obj2','parameter_name1','value',2), ('object','obj2','parameter_name2','value',3)]}) - + data = iter(input_data) data_header = next(data) num_cols = len(data_header) - + mapping = {'map_type': 'ObjectClass', 'name': {'map_type':'column_name','value_reference': 0}, 'object': 0, @@ -101,7 +101,7 @@ def test_read_columncollection_parameters(self): out, errors = read_with_mapping(data, mapping, num_cols, data_header) self.assertEqual(out, self.empty_data) self.assertEqual(errors, []) - + def test_read_pivoted_parameters_from_header(self): input_data = [['object','parameter_name1','parameter_name2'], ['obj1', 0, 1], @@ -113,11 +113,11 @@ def test_read_pivoted_parameters_from_header(self): ('object','obj1','parameter_name2','value',1), ('object','obj2','parameter_name1','value',2), ('object','obj2','parameter_name2','value',3)]}) - + data = iter(input_data) data_header = next(data) num_cols = len(data_header) - + mapping = {'map_type': 'ObjectClass', 'name': {'map_type':'column_name','value_reference': 0}, 'object': 0, @@ -127,7 +127,7 @@ def test_read_pivoted_parameters_from_header(self): out, errors = read_with_mapping(data, mapping, num_cols, data_header) self.assertEqual(out, self.empty_data) self.assertEqual(errors, []) - + def test_read_pivoted_parameters_from_data(self): input_data = [['object','parameter_name1','parameter_name2'], ['obj1', 0, 1], @@ -139,11 +139,11 @@ def test_read_pivoted_parameters_from_data(self): ('object','obj1','parameter_name2','value',1), ('object','obj2','parameter_name1','value',2), ('object','obj2','parameter_name2','value',3)]}) - + data = iter(input_data) #data_header = next(data) num_cols = len(input_data[0]) - + mapping = {'map_type': 'ObjectClass', 'name': 'object', 'object': 0, @@ -153,7 +153,7 @@ def test_read_pivoted_parameters_from_data(self): out, errors = read_with_mapping(data, mapping, num_cols) self.assertEqual(out, self.empty_data) self.assertEqual(errors, []) - + def test_read_flat_file_with_extra_value_dimensions(self): input_data = [['object','time','parameter_name1'], ['obj1','t1',1], @@ -163,11 +163,11 @@ def test_read_flat_file_with_extra_value_dimensions(self): 'object_parameters': [('object','parameter_name1')], 'object_parameter_values': [('object','obj1','parameter_name1','value',[('scenario1','t1',1), ('scenario1','t2',2)])]}) - + data = iter(input_data) data_header = next(data) num_cols = len(data_header) - + mapping = {'map_type':'ObjectClass', 'name': 'object', 'object': 0, @@ -178,7 +178,7 @@ def test_read_flat_file_with_extra_value_dimensions(self): out, errors = read_with_mapping(data, mapping, num_cols, data_header) self.assertEqual(out, self.empty_data) self.assertEqual(errors, []) - + def test_read_relationships(self): input_data = [['unit','node'], ['u1','n1'], @@ -186,11 +186,11 @@ def test_read_relationships(self): self.empty_data.update({'relationship_classes': [('unit__node',('unit','node'))], 'relationships': [('unit__node',('u1','n1')), ('unit__node',('u1','n2'))]}) - + data = iter(input_data) data_header = next(data) num_cols = len(data_header) - + mapping = {'map_type':'RelationshipClass', 'name': 'unit__node', 'object_classes': [0,1], @@ -199,7 +199,7 @@ def test_read_relationships(self): out, errors = read_with_mapping(data, mapping, num_cols, data_header) self.assertEqual(out, self.empty_data) self.assertEqual(errors, []) - + def test_read_relationships_with_parameters(self): input_data = [['unit','node','rel_parameter'], ['u1','n1',0], @@ -208,14 +208,14 @@ def test_read_relationships_with_parameters(self): 'relationships': [('unit__node',('u1','n1')), ('unit__node',('u1','n2'))], 'relationship_parameters': [('unit__node', 'rel_parameter')], - 'relationship_parameter_values': + 'relationship_parameter_values': [('unit__node',('u1','n1'),'rel_parameter','value',0), ('unit__node',('u1','n2'),'rel_parameter','value',1)]}) - + data = iter(input_data) data_header = next(data) num_cols = len(data_header) - + mapping = {'map_type':'RelationshipClass', 'name': 'unit__node', 'object_classes': [0,1], @@ -225,7 +225,7 @@ def test_read_relationships_with_parameters(self): out, errors = read_with_mapping(data, mapping, num_cols, data_header) self.assertEqual(out, self.empty_data) self.assertEqual(errors, []) - + def test_read_parameter_header_with_only_one_parameter(self): input_data = [['object','parameter_name1'], ['obj1', 0], @@ -235,11 +235,11 @@ def test_read_parameter_header_with_only_one_parameter(self): 'object_parameters': [('object','parameter_name1')], 'object_parameter_values': [('object','obj1','parameter_name1','value',0), ('object','obj2','parameter_name1','value',2)]}) - + data = iter(input_data) data_header = next(data) num_cols = len(data_header) - + mapping = {'map_type': 'ObjectClass', 'name': 'object', 'object': 0, @@ -249,7 +249,7 @@ def test_read_parameter_header_with_only_one_parameter(self): out, errors = read_with_mapping(data, mapping, num_cols, data_header) self.assertEqual(out, self.empty_data) self.assertEqual(errors, []) - + def test_read_pivoted_parameters_from_data_with_skipped_column(self): input_data = [['object','parameter_name1','parameter_name2'], ['obj1', 0, 1], @@ -259,11 +259,11 @@ def test_read_pivoted_parameters_from_data_with_skipped_column(self): 'object_parameters': [('object','parameter_name1')], 'object_parameter_values': [('object','obj1','parameter_name1','value',0), ('object','obj2','parameter_name1','value',2)]}) - + data = iter(input_data) #data_header = next(data) num_cols = len(input_data[0]) - + mapping = {'map_type': 'ObjectClass', 'name': 'object', 'object': 0, @@ -274,7 +274,7 @@ def test_read_pivoted_parameters_from_data_with_skipped_column(self): out, errors = read_with_mapping(data, mapping, num_cols) self.assertEqual(out, self.empty_data) self.assertEqual(errors, []) - + def test_read_relationships_and_save_objects(self): input_data = [['unit','node'], ['u1','n1'], @@ -285,11 +285,11 @@ def test_read_relationships_and_save_objects(self): 'object_classes': ['unit', 'node'], 'objects': [('unit','u1'), ('node','n1'), ('unit','u2'), ('node','n2')]}) - + data = iter(input_data) data_header = next(data) num_cols = len(data_header) - + mapping = {'map_type':'RelationshipClass', 'name': 'unit__node', 'object_classes': [0,1], @@ -301,5 +301,5 @@ def test_read_relationships_and_save_objects(self): self.assertEqual(errors, []) if __name__ == '__main__': - + unittest.main()