diff --git a/services/archive/services/client_services/data_quality_notes.py b/services/archive/services/client_services/data_quality_notes.py index 68e9e5e19c4839aecc9ff1e96ad997ad48ad6096..045a513986d159fd3b064211fb608609f68c71fd 100644 --- a/services/archive/services/client_services/data_quality_notes.py +++ b/services/archive/services/client_services/data_quality_notes.py @@ -6,7 +6,7 @@ from pyramid.view import view_config from . import def_name -from pyat.schema.model import ScienceProductComment, ProblemSeverityList, ProblemType +from schema.model import ScienceProductComment, ProblemSeverityList, ProblemType from services import DB from sqlalchemy import exc as sa_exc, asc, desc diff --git a/services/archive/services/ingestion_metadata/ingestion_metadata.py b/services/archive/services/ingestion_metadata/ingestion_metadata.py index 0ef056238f9e77787ee4377fb4bea7218fdd1b1b..1895e9ac5fb8a42c764b75fbb20bb2aace976ca0 100644 --- a/services/archive/services/ingestion_metadata/ingestion_metadata.py +++ b/services/archive/services/ingestion_metadata/ingestion_metadata.py @@ -31,8 +31,8 @@ # from pyramid.view import view_config from pyramid.httpexceptions import exception_response -from pyat.schema import ExecutionBlock, ScienceProduct -from pyat.schema.vlassmodel import ProductVersionArchiveid, ProductVersion, Product, Prerequisite +from schema import ExecutionBlock, ScienceProduct +from schema.vlassmodel import ProductVersionArchiveid, ProductVersion, Product, Prerequisite from sqlalchemy.orm import aliased from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound from services import DB diff --git a/services/archive/services/locator/locator.py b/services/archive/services/locator/locator.py index 5e2f132a00cde38bdfd299ea451f31e0155a672a..a66c2490ca764caae7cd2466df65df1216a08c98 100644 --- a/services/archive/services/locator/locator.py +++ b/services/archive/services/locator/locator.py @@ -7,8 +7,8 @@ The primary user of this information is the archive data fetcher. from functools import reduce from pathlib import Path -from pyat.schema import ScienceProduct, AncillaryProduct -from pyat.schema.ngasmodel import NGASFile, NGASDisk +from schema import ScienceProduct, AncillaryProduct +from schema.ngasmodel import NGASFile, NGASDisk from pyramid.httpexceptions import exception_response from pyramid.view import view_config from sqlalchemy import func diff --git a/services/archive/services/mous_details/mous_details.py b/services/archive/services/mous_details/mous_details.py index ea9a713ecb4e3e8adc6738cfbac04c48398bfaf9..13d3b2461280d1dc0e7ad9e933e38e1b9b8eb547 100644 --- a/services/archive/services/mous_details/mous_details.py +++ b/services/archive/services/mous_details/mous_details.py @@ -8,7 +8,7 @@ from . import def_name from services.solr.query_builder import ArchiveSolrParameters from services.client_services import ResponseMsg -from pyat.schema import AlmaSourceDatum, AlmaSpwDatum, t_alma_spw_sources +from schema import AlmaSourceDatum, AlmaSpwDatum, t_alma_spw_sources from services import DB log = logging.getLogger(__name__) diff --git a/services/archive/setup.py b/services/archive/setup.py index d5921db07025feb0ff3c1e94d8492c7fbb979d04..555b4fd0221b90ffe2b8f6a05d86e23fef1e296b 100644 --- a/services/archive/setup.py +++ b/services/archive/setup.py @@ -37,16 +37,16 @@ def find_version(*file_paths): requires = [ + 'pycapo', 'pyramid', 'pyramid_beaker', + 'pyramid_debugtoolbar', 'pyramid_tm', + 'requests', + 'schema', 'sqlalchemy', 'waitress', - 'zope.sqlalchemy', - 'pycapo', - 'pyat', - 'requests', - 'pyramid_debugtoolbar', + 'zope.sqlalchemy' ] setup(