From d964a28bc22526b9acf9500bee3ed5a4a33d0e4f Mon Sep 17 00:00:00 2001
From: pcain-usgs <pcain@usgs.gov>
Date: Thu, 11 Jun 2020 13:13:38 -0600
Subject: [PATCH] Fix imports
---
bin/prepfiles.py | 16 +++++++---------
geomagio/pcdcp/__init__.py | 9 ++++++++-
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/bin/prepfiles.py b/bin/prepfiles.py
index abc1d6311..d509d5331 100644
--- a/bin/prepfiles.py
+++ b/bin/prepfiles.py
@@ -1,10 +1,9 @@
-from __future__ import absolute_import
+from os import path
+import os
+import sys
from datetime import datetime
from dateutil.relativedelta import relativedelta
-import sys
-from os import path
-import os
from obspy.core import UTCDateTime
# ensure geomag is on the path before importing
@@ -14,11 +13,13 @@ except ImportError:
script_dir = path.dirname(path.abspath(__file__))
sys.path.append(path.normpath(path.join(script_dir, "..")))
-from geomagio.residual import WebAbsolutesFactory, CalFileFactory
-from geomagio.pcdcp.PCDCPFactory import PCDCPFactory, PCDCP_FILE_PATTERN
from geomagio.edge.EdgeFactory import EdgeFactory
+from geomagio.pcdcp import PCDCPFactory, PCDCP_FILE_PATTERN
+from geomagio.residual import WebAbsolutesFactory, CalFileFactory
CAL_FILENAME_FORMAT = "{OBSERVATORY}{YEAR}PCD.cal"
+MIN_TEMPLATE = "file://c:/USGSDCP/%(OBS)s/" + PCDCP_FILE_PATTERN
+RAW_TEMPLATE = "file://c:/RAW/%(OBS)s/" + PCDCP_FILE_PATTERN
if len(sys.argv) != 4:
cmd = sys.argv[0]
@@ -79,9 +80,6 @@ min_timeseries = edge_factory.get_timeseries(
type="variation",
)
-RAW_TEMPLATE = "file://c:/RAW/%(OBS)s/" + PCDCP_FILE_PATTERN
-MIN_TEMPLATE = "file://c:/USGSDCP/%(OBS)s/" + PCDCP_FILE_PATTERN
-
raw_factory = PCDCPFactory(
observatory=OBSERVATORY,
channels=channels,
diff --git a/geomagio/pcdcp/__init__.py b/geomagio/pcdcp/__init__.py
index a391ac9c6..fc819c4ab 100644
--- a/geomagio/pcdcp/__init__.py
+++ b/geomagio/pcdcp/__init__.py
@@ -3,9 +3,16 @@
from __future__ import absolute_import
from .PCDCPFactory import PCDCPFactory
+from .PCDCPFactory import PCDCP_FILE_PATTERN
from .StreamPCDCPFactory import StreamPCDCPFactory
from .PCDCPParser import PCDCPParser
from .PCDCPWriter import PCDCPWriter
-__all__ = ["PCDCPFactory", "StreamPCDCPFactory", "PCDCPParser", "PCDCPWriter"]
+__all__ = [
+ "PCDCPFactory",
+ "PCDCP_FILE_PATTERN",
+ "StreamPCDCPFactory",
+ "PCDCPParser",
+ "PCDCPWriter",
+]
--
GitLab