From 4f5721c1e7d9fc41d05afa8838e1f7a259d864a0 Mon Sep 17 00:00:00 2001
From: Daniel K Lyons <dlyons@nrao.edu>
Date: Wed, 12 Aug 2020 16:42:44 -0600
Subject: [PATCH] Fix the imports to no longer rely on pyat and instead the
broken out data packages
---
.../services/client_services/data_quality_notes.py | 2 +-
.../services/ingestion_metadata/ingestion_metadata.py | 4 ++--
services/archive/services/locator/locator.py | 4 ++--
services/archive/services/mous_details/mous_details.py | 2 +-
services/archive/setup.py | 10 +++++-----
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/services/archive/services/client_services/data_quality_notes.py b/services/archive/services/client_services/data_quality_notes.py
index 68e9e5e19..045a51398 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 0ef056238..1895e9ac5 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 5e2f132a0..a66c2490c 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 ea9a713ec..13d3b2461 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 d5921db07..555b4fd02 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(
--
GitLab