From ee6f3c81a7bbcdd253214b53acd7cda1e5320a45 Mon Sep 17 00:00:00 2001
From: bgeels <bgeels@usgs.gov>
Date: Tue, 26 Mar 2024 15:10:36 -0600
Subject: [PATCH] Replace Metadata.py tempfile w/ better permanent
name/location
---
geomagio/edge/MiniSeedFactory.py | 3 ++-
.../instrument/InstrumentCalibrations.py} | 0
geomagio/metadata/instrument/__init__.py | 6 ++++++
test/Metadata_test.py | 2 +-
test/edge_test/MiniSeedFactory_test.py | 3 ++-
5 files changed, 11 insertions(+), 3 deletions(-)
rename geomagio/{Metadata.py => metadata/instrument/InstrumentCalibrations.py} (100%)
create mode 100644 geomagio/metadata/instrument/__init__.py
diff --git a/geomagio/edge/MiniSeedFactory.py b/geomagio/edge/MiniSeedFactory.py
index 1c898c637..54885511b 100644
--- a/geomagio/edge/MiniSeedFactory.py
+++ b/geomagio/edge/MiniSeedFactory.py
@@ -8,6 +8,7 @@ to take advantage of it's newer realtime abilities.
Edge is the USGS earthquake hazard centers replacement for earthworm.
"""
+
from __future__ import absolute_import
import sys
from typing import List, Optional
@@ -19,7 +20,7 @@ from obspy.core import Stats, Stream, Trace, UTCDateTime
from .. import ChannelConverter, TimeseriesUtility
from ..geomag_types import DataInterval, DataType
-from ..Metadata import get_instrument
+from ..metadata.instrument.InstrumentCalibrations import get_instrument
from ..TimeseriesFactory import TimeseriesFactory
from ..TimeseriesFactoryException import TimeseriesFactoryException
from ..ObservatoryMetadata import ObservatoryMetadata
diff --git a/geomagio/Metadata.py b/geomagio/metadata/instrument/InstrumentCalibrations.py
similarity index 100%
rename from geomagio/Metadata.py
rename to geomagio/metadata/instrument/InstrumentCalibrations.py
diff --git a/geomagio/metadata/instrument/__init__.py b/geomagio/metadata/instrument/__init__.py
new file mode 100644
index 000000000..c470473d1
--- /dev/null
+++ b/geomagio/metadata/instrument/__init__.py
@@ -0,0 +1,6 @@
+from .InstrumentCalibrations import InstrumentCalibrations
+
+
+__all__ = [
+ "InstrumentCalibrations",
+]
diff --git a/test/Metadata_test.py b/test/Metadata_test.py
index 01e5e4171..d56571ac9 100644
--- a/test/Metadata_test.py
+++ b/test/Metadata_test.py
@@ -1,5 +1,5 @@
from obspy import UTCDateTime
-from geomagio.Metadata import get_instrument
+from geomagio.metadata.instrument.InstrumentCalibrations import get_instrument
from numpy.testing import assert_equal
diff --git a/test/edge_test/MiniSeedFactory_test.py b/test/edge_test/MiniSeedFactory_test.py
index 6b0dbbd91..2e9d09526 100644
--- a/test/edge_test/MiniSeedFactory_test.py
+++ b/test/edge_test/MiniSeedFactory_test.py
@@ -1,4 +1,5 @@
"""Tests for MiniSeedFactory.py"""
+
import io
from typing import List
@@ -9,7 +10,7 @@ import pytest
from geomagio import TimeseriesUtility
from geomagio.edge import MiniSeedFactory, MiniSeedInputClient
-from geomagio.Metadata import get_instrument
+from geomagio.metadata.instrument.InstrumentCalibrations import get_instrument
from .mseed_test_clients import MockMiniSeedClient, MisalignedMiniSeedClient
--
GitLab