From af8a90736b97abd82a38dafd34f1275c500f3384 Mon Sep 17 00:00:00 2001
From: Jeremy Fee <jmfee@usgs.gov>
Date: Thu, 12 Dec 2019 11:22:50 -0700
Subject: [PATCH] Fix linting and test errors
---
geomagio/edge/MiniSeedFactory.py | 13 +-----------
test/edge_test/MiniSeedFactory_test.py | 29 +++++++++-----------------
2 files changed, 11 insertions(+), 31 deletions(-)
diff --git a/geomagio/edge/MiniSeedFactory.py b/geomagio/edge/MiniSeedFactory.py
index a6da828e8..bced26bba 100644
--- a/geomagio/edge/MiniSeedFactory.py
+++ b/geomagio/edge/MiniSeedFactory.py
@@ -14,15 +14,8 @@ import sys
from io import BytesIO
import numpy
import numpy.ma
-import obspy.core
-from datetime import datetime
-# try:
-# # obspy 1.x
-# from obspy.clients import earthworm
-# except:
-# # obspy 0.x
-# from obspy import earthworm
+import obspy.core
from obspy.clients.neic import client as miniseed
from .. import ChannelConverter, TimeseriesUtility
@@ -30,9 +23,6 @@ from ..TimeseriesFactory import TimeseriesFactory
from ..TimeseriesFactoryException import TimeseriesFactoryException
from ..ObservatoryMetadata import ObservatoryMetadata
-# for now, still use RawInputClient
-from .RawInputClient import RawInputClient
-
class MiniSeedFactory(TimeseriesFactory):
"""TimeseriesFactory for Edge related data.
@@ -80,7 +70,6 @@ class MiniSeedFactory(TimeseriesFactory):
self.client = miniseed.Client(host, port)
self.observatoryMetadata = observatoryMetadata or ObservatoryMetadata()
- self.tag = tag
self.locationCode = locationCode
self.interval = interval
self.host = host
diff --git a/test/edge_test/MiniSeedFactory_test.py b/test/edge_test/MiniSeedFactory_test.py
index b15835af9..dce141ee1 100644
--- a/test/edge_test/MiniSeedFactory_test.py
+++ b/test/edge_test/MiniSeedFactory_test.py
@@ -28,25 +28,16 @@ def test__get_edge_channel():
"""
# Call private function _get_edge_channel, make certain
# it gets back the appropriate 2 character code.
- assert_equals(MiniSeedFactory()._get_edge_channel('', 'D', '', 'minute'),
- 'UFD')
- assert_equals(MiniSeedFactory()._get_edge_channel('', 'U', '', 'minute'),
- 'UFU')
- assert_equals(MiniSeedFactory()._get_edge_channel('', 'F', '', 'minute'),
- 'UFF')
- assert_equals(MiniSeedFactory()._get_edge_channel('', 'H', '', 'minute'),
- 'UFH')
- assert_equals(MiniSeedFactory()._get_edge_channel('', 'BEU', '', 'minute'),
- 'BEU')
- assert_equals(
- MiniSeedFactory()._get_edge_channel('', 'DIST', '', 'minute'),
- 'UX4')
- assert_equals(MiniSeedFactory()._get_edge_channel('', 'DST', '', 'minute'),
- 'UX3')
- assert_equals(MiniSeedFactory()._get_edge_channel('', 'E-E', '', 'minute'),
- 'UQE')
- assert_equals(MiniSeedFactory()._get_edge_channel('', 'E-N', '', 'minute'),
- 'UQN')
+ factory = MiniSeedFactory()
+ assert_equals(factory._get_edge_channel('', 'D', '', 'minute'), 'UFD')
+ assert_equals(factory._get_edge_channel('', 'U', '', 'minute'), 'UFU')
+ assert_equals(factory._get_edge_channel('', 'F', '', 'minute'), 'UFF')
+ assert_equals(factory._get_edge_channel('', 'H', '', 'minute'), 'UFH')
+ assert_equals(factory._get_edge_channel('', 'BEU', '', 'minute'), 'BEU')
+ assert_equals(factory._get_edge_channel('', 'Dst4', '', 'minute'), 'UX4')
+ assert_equals(factory._get_edge_channel('', 'Dst3', '', 'minute'), 'UX3')
+ assert_equals(factory._get_edge_channel('', 'E-E', '', 'minute'), 'UQE')
+ assert_equals(factory._get_edge_channel('', 'E-N', '', 'minute'), 'UQN')
def test__get_edge_location():
--
GitLab