From 9796ddffeea4313e1dbd9d76f6573571ae274529 Mon Sep 17 00:00:00 2001 From: Matthew Richards Date: Thu, 29 Oct 2020 14:17:54 +0000 Subject: [PATCH] #165: Make this repo pip installable - As suggested by Alan, a top level directory is required to make this repo ready for production use. This is also required for Poetry --- {common => datagateway_api/common}/__init__.py | 0 {common => datagateway_api/common}/backend.py | 0 {common => datagateway_api/common}/backends.py | 8 ++++---- {common => datagateway_api/common}/config.py | 0 .../common}/constants.py | 2 +- .../common}/database/__init__.py | 0 .../common}/database/backend.py | 10 +++++----- .../common}/database/filters.py | 6 +++--- .../common}/database/helpers.py | 14 +++++++------- .../common}/database/models.py | 2 +- .../common}/database/session_manager.py | 2 +- .../common}/date_handler.py | 4 ++-- .../common}/exceptions.py | 0 .../common}/filter_order_handler.py | 2 +- {common => datagateway_api/common}/filters.py | 2 +- {common => datagateway_api/common}/helpers.py | 4 ++-- .../common}/icat/__init__.py | 0 .../common}/icat/backend.py | 10 +++++----- .../common}/icat/filters.py | 8 ++++---- .../common}/icat/helpers.py | 12 ++++++------ .../common}/icat/query.py | 6 +++--- .../common}/logger_setup.py | 2 +- {src => datagateway_api/src}/__init__.py | 0 {src => datagateway_api/src}/main.py | 18 +++++++++--------- .../src}/resources/__init__.py | 0 .../src}/resources/entities/__init__.py | 0 .../src}/resources/entities/entity_endpoint.py | 4 ++-- .../src}/resources/entities/entity_map.py | 2 +- .../src}/resources/non_entities/__init__.py | 0 .../non_entities/sessions_endpoints.py | 10 +++++----- .../src}/resources/table_endpoints/__init__.py | 0 .../table_endpoints/table_endpoints.py | 6 +++--- .../src}/swagger/__init__.py | 0 .../src}/swagger/apispec_flask_restful.py | 0 .../src}/swagger/initialise_spec.py | 2 +- .../src}/swagger/openapi.yaml | 0 test/test_base.py | 2 +- test/test_database_helpers.py | 10 +++++----- test/test_entityHelper.py | 2 +- test/test_helpers.py | 8 ++++---- util/icat_db_generator.py | 4 ++-- 41 files changed, 81 insertions(+), 81 deletions(-) rename {common => datagateway_api/common}/__init__.py (100%) rename {common => datagateway_api/common}/backend.py (100%) rename {common => datagateway_api/common}/backends.py (55%) rename {common => datagateway_api/common}/config.py (100%) rename {common => datagateway_api/common}/constants.py (80%) rename {common => datagateway_api/common}/database/__init__.py (100%) rename {common => datagateway_api/common}/database/backend.py (93%) rename {common => datagateway_api/common}/database/filters.py (96%) rename {common => datagateway_api/common}/database/helpers.py (97%) rename {common => datagateway_api/common}/database/models.py (99%) rename {common => datagateway_api/common}/database/session_manager.py (91%) rename {common => datagateway_api/common}/date_handler.py (95%) rename {common => datagateway_api/common}/exceptions.py (100%) rename {common => datagateway_api/common}/filter_order_handler.py (98%) rename {common => datagateway_api/common}/filters.py (96%) rename {common => datagateway_api/common}/helpers.py (96%) rename {common => datagateway_api/common}/icat/__init__.py (100%) rename {common => datagateway_api/common}/icat/backend.py (95%) rename {common => datagateway_api/common}/icat/filters.py (97%) rename {common => datagateway_api/common}/icat/helpers.py (98%) rename {common => datagateway_api/common}/icat/query.py (98%) rename {common => datagateway_api/common}/logger_setup.py (94%) rename {src => datagateway_api/src}/__init__.py (100%) rename {src => datagateway_api/src}/main.py (85%) rename {src => datagateway_api/src}/resources/__init__.py (100%) rename {src => datagateway_api/src}/resources/entities/__init__.py (100%) rename {src => datagateway_api/src}/resources/entities/entity_endpoint.py (99%) rename {src => datagateway_api/src}/resources/entities/entity_map.py (98%) rename {src => datagateway_api/src}/resources/non_entities/__init__.py (100%) rename {src => datagateway_api/src}/resources/non_entities/sessions_endpoints.py (94%) rename {src => datagateway_api/src}/resources/table_endpoints/__init__.py (100%) rename {src => datagateway_api/src}/resources/table_endpoints/table_endpoints.py (98%) rename {src => datagateway_api/src}/swagger/__init__.py (100%) rename {src => datagateway_api/src}/swagger/apispec_flask_restful.py (100%) rename {src => datagateway_api/src}/swagger/initialise_spec.py (99%) rename {src => datagateway_api/src}/swagger/openapi.yaml (100%) diff --git a/common/__init__.py b/datagateway_api/common/__init__.py similarity index 100% rename from common/__init__.py rename to datagateway_api/common/__init__.py diff --git a/common/backend.py b/datagateway_api/common/backend.py similarity index 100% rename from common/backend.py rename to datagateway_api/common/backend.py diff --git a/common/backends.py b/datagateway_api/common/backends.py similarity index 55% rename from common/backends.py rename to datagateway_api/common/backends.py index cc65e915..17c013d9 100644 --- a/common/backends.py +++ b/datagateway_api/common/backends.py @@ -1,7 +1,7 @@ -from common.database.backend import DatabaseBackend -from common.icat.backend import PythonICATBackend -from common.backend import Backend -from common.config import config +from datagateway_api.common.database.backend import DatabaseBackend +from datagateway_api.common.icat.backend import PythonICATBackend +from datagateway_api.common.backend import Backend +from datagateway_api.common.config import config import sys backend_type = config.get_backend_type() diff --git a/common/config.py b/datagateway_api/common/config.py similarity index 100% rename from common/config.py rename to datagateway_api/common/config.py diff --git a/common/constants.py b/datagateway_api/common/constants.py similarity index 80% rename from common/constants.py rename to datagateway_api/common/constants.py index 8dbdb7c3..f6e502e6 100644 --- a/common/constants.py +++ b/datagateway_api/common/constants.py @@ -1,4 +1,4 @@ -from common.config import config +from datagateway_api.common.config import config class Constants: diff --git a/common/database/__init__.py b/datagateway_api/common/database/__init__.py similarity index 100% rename from common/database/__init__.py rename to datagateway_api/common/database/__init__.py diff --git a/common/database/backend.py b/datagateway_api/common/database/backend.py similarity index 93% rename from common/database/backend.py rename to datagateway_api/common/database/backend.py index fb398f93..6a0f3e29 100644 --- a/common/database/backend.py +++ b/datagateway_api/common/database/backend.py @@ -1,5 +1,5 @@ -from common.backend import Backend -from common.database.helpers import ( +from datagateway_api.common.backend import Backend +from datagateway_api.common.database.helpers import ( get_facility_cycles_for_instrument, get_facility_cycles_for_instrument_count, get_investigations_for_instrument_in_facility_cycle, @@ -15,10 +15,10 @@ get_first_filtered_row, requires_session_id, ) -from common.helpers import queries_records -from common.database.models import EntityHelper, SESSION +from datagateway_api.common.helpers import queries_records +from datagateway_api.common.database.models import EntityHelper, SESSION import uuid -from common.exceptions import AuthenticationError +from datagateway_api.common.exceptions import AuthenticationError import datetime import logging diff --git a/common/database/filters.py b/datagateway_api/common/database/filters.py similarity index 96% rename from common/database/filters.py rename to datagateway_api/common/database/filters.py index 8eba4e36..89099416 100644 --- a/common/database/filters.py +++ b/datagateway_api/common/database/filters.py @@ -1,4 +1,4 @@ -from common.filters import ( +from datagateway_api.common.filters import ( WhereFilter, DistinctFieldFilter, OrderFilter, @@ -6,8 +6,8 @@ LimitFilter, IncludeFilter, ) -from common.exceptions import FilterError, MultipleIncludeError -from common.database import models +from datagateway_api.common.exceptions import FilterError, MultipleIncludeError +from datagateway_api.common.database import models from sqlalchemy import asc, desc import logging diff --git a/common/database/helpers.py b/datagateway_api/common/database/helpers.py similarity index 97% rename from common/database/helpers.py rename to datagateway_api/common/database/helpers.py index 9857302b..228381b7 100644 --- a/common/database/helpers.py +++ b/datagateway_api/common/database/helpers.py @@ -5,7 +5,7 @@ from sqlalchemy.orm import aliased -from common.exceptions import ( +from datagateway_api.common.exceptions import ( ApiError, AuthenticationError, MissingRecordError, @@ -13,7 +13,7 @@ BadRequestError, MultipleIncludeError, ) -from common.database.models import ( +from datagateway_api.common.database.models import ( INVESTIGATION, INSTRUMENT, FACILITYCYCLE, @@ -21,13 +21,13 @@ FACILITY, SESSION, ) -from common.database.session_manager import session_manager -from common.filter_order_handler import FilterOrderHandler -from common.config import config +from datagateway_api.common.database.session_manager import session_manager +from datagateway_api.common.filter_order_handler import FilterOrderHandler +from datagateway_api.common.config import config backend_type = config.get_backend_type() if backend_type == "db": - from common.database.filters import ( + from datagateway_api.common.database.filters import ( DatabaseWhereFilter as WhereFilter, DatabaseDistinctFieldFilter as DistinctFieldFilter, DatabaseOrderFilter as OrderFilter, @@ -36,7 +36,7 @@ DatabaseIncludeFilter as IncludeFilter, ) elif backend_type == "python_icat": - from common.icat.filters import ( + from datagateway_api.common.icat.filters import ( PythonICATWhereFilter as WhereFilter, PythonICATDistinctFieldFilter as DistinctFieldFilter, PythonICATOrderFilter as OrderFilter, diff --git a/common/database/models.py b/datagateway_api/common/database/models.py similarity index 99% rename from common/database/models.py rename to datagateway_api/common/database/models.py index 7e8790ac..75e17a08 100644 --- a/common/database/models.py +++ b/datagateway_api/common/database/models.py @@ -20,7 +20,7 @@ from sqlalchemy.orm import relationship from sqlalchemy.orm.collections import InstrumentedList -from common.exceptions import FilterError, DatabaseError, ApiError +from datagateway_api.common.exceptions import FilterError, DatabaseError, ApiError Base = declarative_base() diff --git a/common/database/session_manager.py b/datagateway_api/common/database/session_manager.py similarity index 91% rename from common/database/session_manager.py rename to datagateway_api/common/database/session_manager.py index dcf13e12..9466d4fc 100644 --- a/common/database/session_manager.py +++ b/datagateway_api/common/database/session_manager.py @@ -2,7 +2,7 @@ from sqlalchemy.orm import sessionmaker, scoped_session from sqlalchemy.pool import QueuePool -from common.constants import Constants +from datagateway_api.common.constants import Constants engine = create_engine( Constants.DATABASE_URL, poolclass=QueuePool, pool_size=100, max_overflow=0 diff --git a/common/date_handler.py b/datagateway_api/common/date_handler.py similarity index 95% rename from common/date_handler.py rename to datagateway_api/common/date_handler.py index e6e0d00a..f192e3ae 100644 --- a/common/date_handler.py +++ b/datagateway_api/common/date_handler.py @@ -1,8 +1,8 @@ from datetime import datetime from dateutil.parser import parse -from common.exceptions import BadRequestError -from common.constants import Constants +from datagateway_api.common.exceptions import BadRequestError +from datagateway_api.common.constants import Constants class DateHandler: diff --git a/common/exceptions.py b/datagateway_api/common/exceptions.py similarity index 100% rename from common/exceptions.py rename to datagateway_api/common/exceptions.py diff --git a/common/filter_order_handler.py b/datagateway_api/common/filter_order_handler.py similarity index 98% rename from common/filter_order_handler.py rename to datagateway_api/common/filter_order_handler.py index 2a8ca588..7801667c 100644 --- a/common/filter_order_handler.py +++ b/datagateway_api/common/filter_order_handler.py @@ -1,6 +1,6 @@ import logging -from common.icat.filters import ( +from datagateway_api.common.icat.filters import ( PythonICATLimitFilter, PythonICATSkipFilter, PythonICATOrderFilter, diff --git a/common/filters.py b/datagateway_api/common/filters.py similarity index 96% rename from common/filters.py rename to datagateway_api/common/filters.py index 07de77fa..c101c67f 100644 --- a/common/filters.py +++ b/datagateway_api/common/filters.py @@ -1,7 +1,7 @@ from abc import ABC, abstractmethod import logging -from common.exceptions import BadRequestError +from datagateway_api.common.exceptions import BadRequestError log = logging.getLogger() diff --git a/common/helpers.py b/datagateway_api/common/helpers.py similarity index 96% rename from common/helpers.py rename to datagateway_api/common/helpers.py index 0480cfcb..5475c115 100644 --- a/common/helpers.py +++ b/datagateway_api/common/helpers.py @@ -6,8 +6,8 @@ from flask_restful import reqparse from sqlalchemy.exc import IntegrityError -from common.database.helpers import QueryFilterFactory -from common.exceptions import ( +from datagateway_api.common.database.helpers import QueryFilterFactory +from datagateway_api.common.exceptions import ( ApiError, AuthenticationError, FilterError, diff --git a/common/icat/__init__.py b/datagateway_api/common/icat/__init__.py similarity index 100% rename from common/icat/__init__.py rename to datagateway_api/common/icat/__init__.py diff --git a/common/icat/backend.py b/datagateway_api/common/icat/backend.py similarity index 95% rename from common/icat/backend.py rename to datagateway_api/common/icat/backend.py index ec667017..25834bbe 100644 --- a/common/icat/backend.py +++ b/datagateway_api/common/icat/backend.py @@ -3,9 +3,9 @@ import icat.client from icat.exception import ICATSessionError -from common.backend import Backend -from common.helpers import queries_records -from common.icat.helpers import ( +from datagateway_api.common.backend import Backend +from datagateway_api.common.helpers import queries_records +from datagateway_api.common.icat.helpers import ( requires_session_id, get_session_details_helper, logout_icat_client, @@ -24,8 +24,8 @@ get_investigations_for_instrument_in_facility_cycle_count, ) -from common.config import config -from common.exceptions import AuthenticationError +from datagateway_api.common.config import config +from datagateway_api.common.exceptions import AuthenticationError log = logging.getLogger() diff --git a/common/icat/filters.py b/datagateway_api/common/icat/filters.py similarity index 97% rename from common/icat/filters.py rename to datagateway_api/common/icat/filters.py index e47a156c..f4f86a3a 100644 --- a/common/icat/filters.py +++ b/datagateway_api/common/icat/filters.py @@ -1,6 +1,6 @@ import logging -from common.filters import ( +from datagateway_api.common.filters import ( WhereFilter, DistinctFieldFilter, OrderFilter, @@ -8,9 +8,9 @@ LimitFilter, IncludeFilter, ) -from common.exceptions import FilterError -from common.config import config -from common.constants import Constants +from datagateway_api.common.exceptions import FilterError +from datagateway_api.common.config import config +from datagateway_api.common.constants import Constants log = logging.getLogger() diff --git a/common/icat/helpers.py b/datagateway_api/common/icat/helpers.py similarity index 98% rename from common/icat/helpers.py rename to datagateway_api/common/icat/helpers.py index 77897624..4c54187a 100644 --- a/common/icat/helpers.py +++ b/datagateway_api/common/icat/helpers.py @@ -11,17 +11,17 @@ ICATNoObjectError, ICATParameterError, ) -from common.exceptions import ( +from datagateway_api.common.exceptions import ( AuthenticationError, BadRequestError, MissingRecordError, PythonICATError, ) -from common.filter_order_handler import FilterOrderHandler -from common.date_handler import DateHandler -from common.constants import Constants -from common.icat.filters import PythonICATLimitFilter, PythonICATWhereFilter -from common.icat.query import ICATQuery +from datagateway_api.common.filter_order_handler import FilterOrderHandler +from datagateway_api.common.date_handler import DateHandler +from datagateway_api.common.constants import Constants +from datagateway_api.common.icat.filters import PythonICATLimitFilter, PythonICATWhereFilter +from datagateway_api.common.icat.query import ICATQuery log = logging.getLogger() diff --git a/common/icat/query.py b/datagateway_api/common/icat/query.py similarity index 98% rename from common/icat/query.py rename to datagateway_api/common/icat/query.py index 1808167f..fa7ac3b7 100644 --- a/common/icat/query.py +++ b/datagateway_api/common/icat/query.py @@ -6,9 +6,9 @@ from icat.query import Query from icat.exception import ICATValidationError, ICATInternalError -from common.exceptions import PythonICATError, FilterError -from common.date_handler import DateHandler -from common.constants import Constants +from datagateway_api.common.exceptions import PythonICATError, FilterError +from datagateway_api.common.date_handler import DateHandler +from datagateway_api.common.constants import Constants log = logging.getLogger() diff --git a/common/logger_setup.py b/datagateway_api/common/logger_setup.py similarity index 94% rename from common/logger_setup.py rename to datagateway_api/common/logger_setup.py index 2efcad5d..827ff9fb 100644 --- a/common/logger_setup.py +++ b/datagateway_api/common/logger_setup.py @@ -1,7 +1,7 @@ import logging.config from pathlib import Path -from common.config import config +from datagateway_api.common.config import config log_level = "DEBUG" LOG_FILE_NAME = Path(__file__).parent.parent / "logs.log" diff --git a/src/__init__.py b/datagateway_api/src/__init__.py similarity index 100% rename from src/__init__.py rename to datagateway_api/src/__init__.py diff --git a/src/main.py b/datagateway_api/src/main.py similarity index 85% rename from src/main.py rename to datagateway_api/src/main.py index f93805f8..5056e731 100644 --- a/src/main.py +++ b/datagateway_api/src/main.py @@ -3,28 +3,28 @@ from flask_restful import Api from flask_swagger_ui import get_swaggerui_blueprint -from common.config import config -from common.logger_setup import setup_logger -from src.resources.entities.entity_endpoint import ( +from datagateway_api.common.config import config +from datagateway_api.common.logger_setup import setup_logger +from datagateway_api.src.resources.entities.entity_endpoint import ( get_endpoint, get_id_endpoint, get_count_endpoint, get_find_one_endpoint, ) -from src.resources.entities.entity_map import endpoints -from src.resources.non_entities.sessions_endpoints import * -from src.resources.table_endpoints.table_endpoints import ( +from datagateway_api.src.resources.entities.entity_map import endpoints +from datagateway_api.src.resources.non_entities.sessions_endpoints import * +from datagateway_api.src.resources.table_endpoints.table_endpoints import ( InstrumentsFacilityCycles, InstrumentsFacilityCyclesCount, InstrumentsFacilityCyclesInvestigations, InstrumentsFacilityCyclesInvestigationsCount, ) -from common.exceptions import ApiError +from datagateway_api.common.exceptions import ApiError from apispec import APISpec from pathlib import Path import json -from src.swagger.apispec_flask_restful import RestfulPlugin -from src.swagger.initialise_spec import initialise_spec +from datagateway_api.src.swagger.apispec_flask_restful import RestfulPlugin +from datagateway_api.src.swagger.initialise_spec import initialise_spec spec = APISpec( diff --git a/src/resources/__init__.py b/datagateway_api/src/resources/__init__.py similarity index 100% rename from src/resources/__init__.py rename to datagateway_api/src/resources/__init__.py diff --git a/src/resources/entities/__init__.py b/datagateway_api/src/resources/entities/__init__.py similarity index 100% rename from src/resources/entities/__init__.py rename to datagateway_api/src/resources/entities/__init__.py diff --git a/src/resources/entities/entity_endpoint.py b/datagateway_api/src/resources/entities/entity_endpoint.py similarity index 99% rename from src/resources/entities/entity_endpoint.py rename to datagateway_api/src/resources/entities/entity_endpoint.py index cc38e777..881e13e4 100644 --- a/src/resources/entities/entity_endpoint.py +++ b/datagateway_api/src/resources/entities/entity_endpoint.py @@ -1,11 +1,11 @@ from flask import request from flask_restful import Resource -from common.helpers import ( +from datagateway_api.common.helpers import ( get_session_id_from_auth_header, get_filters_from_query_string, ) -from common.backends import backend +from datagateway_api.common.backends import backend def get_endpoint(name, entity_type): diff --git a/src/resources/entities/entity_map.py b/datagateway_api/src/resources/entities/entity_map.py similarity index 98% rename from src/resources/entities/entity_map.py rename to datagateway_api/src/resources/entities/entity_map.py index afb05e20..30acdc0b 100644 --- a/src/resources/entities/entity_map.py +++ b/datagateway_api/src/resources/entities/entity_map.py @@ -1,4 +1,4 @@ -from common.database.models import EntityHelper +from datagateway_api.common.database.models import EntityHelper import datetime from sqlalchemy.inspection import inspect diff --git a/src/resources/non_entities/__init__.py b/datagateway_api/src/resources/non_entities/__init__.py similarity index 100% rename from src/resources/non_entities/__init__.py rename to datagateway_api/src/resources/non_entities/__init__.py diff --git a/src/resources/non_entities/sessions_endpoints.py b/datagateway_api/src/resources/non_entities/sessions_endpoints.py similarity index 94% rename from src/resources/non_entities/sessions_endpoints.py rename to datagateway_api/src/resources/non_entities/sessions_endpoints.py index 3d4202cf..060a3ee4 100644 --- a/src/resources/non_entities/sessions_endpoints.py +++ b/datagateway_api/src/resources/non_entities/sessions_endpoints.py @@ -4,15 +4,15 @@ from flask import request from flask_restful import Resource, reqparse -from common.database.helpers import ( +from datagateway_api.common.database.helpers import ( insert_row_into_table, delete_row_by_id, get_row_by_id, ) -from common.helpers import get_session_id_from_auth_header -from common.database.models import SESSION -from common.backends import backend -from common.exceptions import AuthenticationError +from datagateway_api.common.helpers import get_session_id_from_auth_header +from datagateway_api.common.database.models import SESSION +from datagateway_api.common.backends import backend +from datagateway_api.common.exceptions import AuthenticationError log = logging.getLogger() diff --git a/src/resources/table_endpoints/__init__.py b/datagateway_api/src/resources/table_endpoints/__init__.py similarity index 100% rename from src/resources/table_endpoints/__init__.py rename to datagateway_api/src/resources/table_endpoints/__init__.py diff --git a/src/resources/table_endpoints/table_endpoints.py b/datagateway_api/src/resources/table_endpoints/table_endpoints.py similarity index 98% rename from src/resources/table_endpoints/table_endpoints.py rename to datagateway_api/src/resources/table_endpoints/table_endpoints.py index d2584c89..8f543b02 100644 --- a/src/resources/table_endpoints/table_endpoints.py +++ b/datagateway_api/src/resources/table_endpoints/table_endpoints.py @@ -1,16 +1,16 @@ from flask_restful import Resource -from common.database.helpers import ( +from datagateway_api.common.database.helpers import ( get_facility_cycles_for_instrument, get_facility_cycles_for_instrument_count, get_investigations_for_instrument_in_facility_cycle, get_investigations_for_instrument_in_facility_cycle_count, ) -from common.helpers import ( +from datagateway_api.common.helpers import ( get_session_id_from_auth_header, get_filters_from_query_string, ) -from common.backends import backend +from datagateway_api.common.backends import backend class InstrumentsFacilityCycles(Resource): diff --git a/src/swagger/__init__.py b/datagateway_api/src/swagger/__init__.py similarity index 100% rename from src/swagger/__init__.py rename to datagateway_api/src/swagger/__init__.py diff --git a/src/swagger/apispec_flask_restful.py b/datagateway_api/src/swagger/apispec_flask_restful.py similarity index 100% rename from src/swagger/apispec_flask_restful.py rename to datagateway_api/src/swagger/apispec_flask_restful.py diff --git a/src/swagger/initialise_spec.py b/datagateway_api/src/swagger/initialise_spec.py similarity index 99% rename from src/swagger/initialise_spec.py rename to datagateway_api/src/swagger/initialise_spec.py index 5147b3ff..d9c272e6 100644 --- a/src/swagger/initialise_spec.py +++ b/datagateway_api/src/swagger/initialise_spec.py @@ -1,4 +1,4 @@ -from src.resources.entities.entity_map import create_entity_models +from datagateway_api.src.resources.entities.entity_map import create_entity_models def initialise_spec(spec): diff --git a/src/swagger/openapi.yaml b/datagateway_api/src/swagger/openapi.yaml similarity index 100% rename from src/swagger/openapi.yaml rename to datagateway_api/src/swagger/openapi.yaml diff --git a/test/test_base.py b/test/test_base.py index 9c8f1d9b..31677e1d 100644 --- a/test/test_base.py +++ b/test/test_base.py @@ -1,6 +1,6 @@ from unittest import TestCase -from src.main import app +from datagateway_api.src.main import app class FlaskAppTest(TestCase): diff --git a/test/test_database_helpers.py b/test/test_database_helpers.py index d7ee2173..881e7f7b 100644 --- a/test/test_database_helpers.py +++ b/test/test_database_helpers.py @@ -1,12 +1,12 @@ from unittest import TestCase -from common.database.helpers import QueryFilterFactory -from common.config import config -from common.exceptions import ApiError +from datagateway_api.common.database.helpers import QueryFilterFactory +from datagateway_api.common.config import config +from datagateway_api.common.exceptions import ApiError backend_type = config.get_backend_type() if backend_type == "db": - from common.database.filters import ( + from datagateway_api.common.database.filters import ( DatabaseWhereFilter as WhereFilter, DatabaseDistinctFieldFilter as DistinctFieldFilter, DatabaseOrderFilter as OrderFilter, @@ -16,7 +16,7 @@ ) elif backend_type == "python_icat": # TODO - Adapt these tests for the ICAT implementation of filters - from common.icat.filters import ( + from datagateway_api.common.icat.filters import ( PythonICATWhereFilter as WhereFilter, PythonICATDistinctFieldFilter as DistinctFieldFilter, PythonICATOrderFilter as OrderFilter, diff --git a/test/test_entityHelper.py b/test/test_entityHelper.py index 586ba40c..cbee5a3e 100644 --- a/test/test_entityHelper.py +++ b/test/test_entityHelper.py @@ -1,7 +1,7 @@ import datetime from unittest import TestCase -from common.database.models import DATAFILE, DATASET, DATAFILEFORMAT, INVESTIGATION +from datagateway_api.common.database.models import DATAFILE, DATASET, DATAFILEFORMAT, INVESTIGATION class TestEntityHelper(TestCase): diff --git a/test/test_helpers.py b/test/test_helpers.py index b91d10c6..749d4785 100644 --- a/test/test_helpers.py +++ b/test/test_helpers.py @@ -2,7 +2,7 @@ from sqlalchemy.exc import IntegrityError -from common.database.helpers import ( +from datagateway_api.common.database.helpers import ( delete_row_by_id, insert_row_into_table, LimitFilter, @@ -12,20 +12,20 @@ WhereFilter, OrderFilter, ) -from common.exceptions import ( +from datagateway_api.common.exceptions import ( MissingRecordError, FilterError, BadRequestError, MissingCredentialsError, AuthenticationError, ) -from common.helpers import ( +from datagateway_api.common.helpers import ( is_valid_json, queries_records, get_session_id_from_auth_header, get_filters_from_query_string, ) -from common.database.models import SESSION +from datagateway_api.common.database.models import SESSION from test.test_base import FlaskAppTest diff --git a/util/icat_db_generator.py b/util/icat_db_generator.py index d954b169..fa874cc6 100644 --- a/util/icat_db_generator.py +++ b/util/icat_db_generator.py @@ -6,8 +6,8 @@ from faker import Faker -from common.database import models -from common.database.session_manager import session_manager +from datagateway_api.common.database import models +from datagateway_api.common.database.session_manager import session_manager parser = argparse.ArgumentParser() parser.add_argument(