From f53358e54b3bf5206e86fa86bef5b4a0fa073647 Mon Sep 17 00:00:00 2001 From: Manuel Marin Date: Tue, 26 Mar 2019 09:41:26 -0400 Subject: [PATCH] Issue #22, let's go with spinedb_api --- MANIFEST.in | 2 +- setup.py | 4 ++-- {spine_dbapi => spinedb_api}/__init__.py | 0 {spine_dbapi => spinedb_api}/alembic.ini | 0 {spine_dbapi => spinedb_api}/alembic/README | 0 {spine_dbapi => spinedb_api}/alembic/env.py | 0 {spine_dbapi => spinedb_api}/alembic/script.py.mako | 0 ...7b69acf7_add_parameter_tag_and_parameter_value_list.py | 0 ...19c53d5701_rename_parameter_to_parameter_definition.py | 0 {spine_dbapi => spinedb_api}/database_mapping.py | 0 {spine_dbapi => spinedb_api}/diff_database_mapping.py | 0 {spine_dbapi => spinedb_api}/exception.py | 0 {spine_dbapi => spinedb_api}/helpers.py | 0 {spine_dbapi => spinedb_api}/import_functions.py | 0 {spine_dbapi => spinedb_api}/json_mapping.py | 0 {spine_dbapi => spinedb_api}/version.py | 0 test/test_DiffDatabaseMapping.py | 4 ++-- test/test_database_mapping.py | 6 +++--- test/test_import_functions.py | 8 ++++---- test/test_json_mapping.py | 2 +- 20 files changed, 13 insertions(+), 13 deletions(-) rename {spine_dbapi => spinedb_api}/__init__.py (100%) rename {spine_dbapi => spinedb_api}/alembic.ini (100%) rename {spine_dbapi => spinedb_api}/alembic/README (100%) rename {spine_dbapi => spinedb_api}/alembic/env.py (100%) rename {spine_dbapi => spinedb_api}/alembic/script.py.mako (100%) rename {spine_dbapi => spinedb_api}/alembic/versions/51fd7b69acf7_add_parameter_tag_and_parameter_value_list.py (100%) rename {spine_dbapi => spinedb_api}/alembic/versions/8c19c53d5701_rename_parameter_to_parameter_definition.py (100%) rename {spine_dbapi => spinedb_api}/database_mapping.py (100%) rename {spine_dbapi => spinedb_api}/diff_database_mapping.py (100%) rename {spine_dbapi => spinedb_api}/exception.py (100%) rename {spine_dbapi => spinedb_api}/helpers.py (100%) rename {spine_dbapi => spinedb_api}/import_functions.py (100%) rename {spine_dbapi => spinedb_api}/json_mapping.py (100%) rename {spine_dbapi => spinedb_api}/version.py (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 6d17bb6c..91066257 100644 --- 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 index c3ddf9b2..edd93a0f 100644 --- 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 b/spinedb_api/__init__.py similarity index 100% rename from spine_dbapi/__init__.py rename to spinedb_api/__init__.py diff --git a/spine_dbapi/alembic.ini b/spinedb_api/alembic.ini similarity index 100% rename from spine_dbapi/alembic.ini rename to spinedb_api/alembic.ini diff --git a/spine_dbapi/alembic/README b/spinedb_api/alembic/README similarity index 100% rename from spine_dbapi/alembic/README rename to spinedb_api/alembic/README diff --git a/spine_dbapi/alembic/env.py b/spinedb_api/alembic/env.py similarity index 100% rename from spine_dbapi/alembic/env.py rename to spinedb_api/alembic/env.py diff --git a/spine_dbapi/alembic/script.py.mako b/spinedb_api/alembic/script.py.mako similarity index 100% rename from spine_dbapi/alembic/script.py.mako rename to spinedb_api/alembic/script.py.mako diff --git a/spine_dbapi/alembic/versions/51fd7b69acf7_add_parameter_tag_and_parameter_value_list.py b/spinedb_api/alembic/versions/51fd7b69acf7_add_parameter_tag_and_parameter_value_list.py similarity index 100% rename from spine_dbapi/alembic/versions/51fd7b69acf7_add_parameter_tag_and_parameter_value_list.py rename to spinedb_api/alembic/versions/51fd7b69acf7_add_parameter_tag_and_parameter_value_list.py diff --git a/spine_dbapi/alembic/versions/8c19c53d5701_rename_parameter_to_parameter_definition.py b/spinedb_api/alembic/versions/8c19c53d5701_rename_parameter_to_parameter_definition.py similarity index 100% rename from spine_dbapi/alembic/versions/8c19c53d5701_rename_parameter_to_parameter_definition.py rename to spinedb_api/alembic/versions/8c19c53d5701_rename_parameter_to_parameter_definition.py diff --git a/spine_dbapi/database_mapping.py b/spinedb_api/database_mapping.py similarity index 100% rename from spine_dbapi/database_mapping.py rename to spinedb_api/database_mapping.py diff --git a/spine_dbapi/diff_database_mapping.py b/spinedb_api/diff_database_mapping.py similarity index 100% rename from spine_dbapi/diff_database_mapping.py rename to spinedb_api/diff_database_mapping.py diff --git a/spine_dbapi/exception.py b/spinedb_api/exception.py similarity index 100% rename from spine_dbapi/exception.py rename to spinedb_api/exception.py diff --git a/spine_dbapi/helpers.py b/spinedb_api/helpers.py similarity index 100% rename from spine_dbapi/helpers.py rename to spinedb_api/helpers.py diff --git a/spine_dbapi/import_functions.py b/spinedb_api/import_functions.py similarity index 100% rename from spine_dbapi/import_functions.py rename to spinedb_api/import_functions.py diff --git a/spine_dbapi/json_mapping.py b/spinedb_api/json_mapping.py similarity index 100% rename from spine_dbapi/json_mapping.py rename to spinedb_api/json_mapping.py diff --git a/spine_dbapi/version.py b/spinedb_api/version.py similarity index 100% rename from spine_dbapi/version.py rename to spinedb_api/version.py diff --git a/test/test_DiffDatabaseMapping.py b/test/test_DiffDatabaseMapping.py index c81b1b49..4a8f2652 100644 --- 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 index edff6cef..c8696bde 100644 --- 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 index d2a8346c..b5046343 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('/spine_dbapi') +#sys.path.append('/spinedb_api') import unittest @@ -24,9 +24,9 @@ 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 index b497d7da..716dadd4 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 spine_dbapi.json_mapping import read_with_mapping +from spinedb_api.json_mapping import read_with_mapping class TestMappingIntegration(unittest.TestCase):