From 696b39c01bf6a6a7b84ac0dfcfc931b4ebb4bc9c Mon Sep 17 00:00:00 2001
From: "Janet L. Goldstein" <jgoldste@nrao.edu>
Date: Tue, 29 Jun 2021 09:02:50 -0600
Subject: [PATCH] WS-507: utility_classes => utilities and type (built-in) =>
sp_type
---
.../pexable/ingest_envoy/ingest_envoy/ingestion_manifest.py | 2 +-
.../ingest_envoy/{utility_classes.py => utilities.py} | 4 ++--
.../pexable/ingest_envoy/test/test_evla_ing_manifests.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
rename apps/cli/executables/pexable/ingest_envoy/ingest_envoy/{utility_classes.py => utilities.py} (95%)
diff --git a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingestion_manifest.py b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingestion_manifest.py
index 9a7b6afe7..dc3865179 100644
--- a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingestion_manifest.py
+++ b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingestion_manifest.py
@@ -2,7 +2,7 @@
from pathlib import Path
-from .utility_classes import (
+from .utilities import (
Telescope,
ScienceProduct,
)
diff --git a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/utility_classes.py b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/utilities.py
similarity index 95%
rename from apps/cli/executables/pexable/ingest_envoy/ingest_envoy/utility_classes.py
rename to apps/cli/executables/pexable/ingest_envoy/ingest_envoy/utilities.py
index 9adfa5225..09366f128 100644
--- a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/utility_classes.py
+++ b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/utilities.py
@@ -61,8 +61,8 @@ class ScienceProductType(Enum):
class ScienceProduct:
"""Represents a science product in an ingestion manifest"""
- def __init__(self, type: ScienceProductType, filename: str, locator: str, group_with: str):
- self.type = type
+ def __init__(self, sp_type: ScienceProductType, filename: str, locator: str, group_with: str):
+ self.sp_type = sp_type
self.filename = filename
# product locator, used for input groups; locator for a known science product
self.locator = locator
diff --git a/apps/cli/executables/pexable/ingest_envoy/test/test_evla_ing_manifests.py b/apps/cli/executables/pexable/ingest_envoy/test/test_evla_ing_manifests.py
index 2fe8bf977..319074aba 100644
--- a/apps/cli/executables/pexable/ingest_envoy/test/test_evla_ing_manifests.py
+++ b/apps/cli/executables/pexable/ingest_envoy/test/test_evla_ing_manifests.py
@@ -5,7 +5,7 @@ import pytest
from ..ingest_envoy.ingestion_manifest import Parameters
from ..ingest_envoy.ingestion_manifest_builder import IngestionManifestBuilder
-from apps.cli.executables.pexable.ingest_envoy.ingest_envoy.utility_classes import Telescope
+from apps.cli.executables.pexable.ingest_envoy.ingest_envoy.utilities import Telescope
@pytest.mark.skip("TODO: test_builds_evla_sdm_manifest")
--
GitLab