From 93a7050c4fa260a14228662b92ee9fdee5d3ac13 Mon Sep 17 00:00:00 2001
From: bgeels <bgeels@usgs.gov>
Date: Wed, 17 Apr 2024 15:38:38 -0600
Subject: [PATCH] Black re-reformatting
---
bin/__init__.py | 1 +
geomagio/ChannelConverter.py | 1 -
geomagio/PlotTimeseriesFactory.py | 1 +
geomagio/StreamConverter.py | 1 +
geomagio/StreamTimeseriesFactory.py | 1 +
geomagio/TimeseriesFactory.py | 1 +
geomagio/TimeseriesUtility.py | 9 ++++++---
geomagio/algorithm/AverageAlgorithm.py | 1 +
geomagio/algorithm/DeltaFAlgorithm.py | 1 +
geomagio/algorithm/SqDistAlgorithm.py | 1 +
geomagio/algorithm/XYZAlgorithm.py | 1 +
geomagio/algorithm/__init__.py | 1 +
geomagio/api/app.py | 1 +
geomagio/api/secure/__init__.py | 1 +
geomagio/api/secure/login.py | 1 +
geomagio/api/secure/metadata.py | 1 +
geomagio/api/ws/Observatory.py | 14 ++++++++------
geomagio/api/ws/__init__.py | 1 +
geomagio/api/ws/app.py | 6 +++---
geomagio/binlog/BinLogFactory.py | 1 +
geomagio/binlog/StreamBinLogFactory.py | 1 +
geomagio/binlog/__init__.py | 1 +
geomagio/biq/BIQFactory.py | 1 +
geomagio/edge/EdgeFactory.py | 1 +
geomagio/edge/MiniSeedFactory.py | 1 +
geomagio/edge/RawInputClient.py | 1 -
geomagio/edge/__init__.py | 1 +
geomagio/iaga2002/IAGA2002Factory.py | 1 +
geomagio/iaga2002/IAGA2002Parser.py | 1 -
geomagio/iaga2002/StreamIAGA2002Factory.py | 1 +
geomagio/iaga2002/__init__.py | 1 +
geomagio/imfjson/IMFJSONFactory.py | 1 +
geomagio/imfjson/__init__.py | 1 +
geomagio/imfv122/IMFV122Factory.py | 1 +
geomagio/imfv122/IMFV122Parser.py | 1 -
geomagio/imfv122/StreamIMFV122Factory.py | 1 +
geomagio/imfv122/__init__.py | 1 +
geomagio/imfv283/GOESIMFV283Factory.py | 1 +
geomagio/imfv283/IMFV283Factory.py | 1 +
geomagio/imfv283/IMFV283Parser.py | 1 +
geomagio/imfv283/StreamIMFV283Factory.py | 1 +
geomagio/imfv283/__init__.py | 1 +
geomagio/metadata/MetadataCategory.py | 1 +
geomagio/pcdcp/PCDCPFactory.py | 1 +
geomagio/pcdcp/PCDCPParser.py | 3 +--
geomagio/pcdcp/PCDCPWriter.py | 8 +++++---
geomagio/pcdcp/StreamPCDCPFactory.py | 1 +
geomagio/pcdcp/__init__.py | 1 +
geomagio/processing/__init__.py | 1 +
geomagio/residual/CalFileFactory.py | 1 +
geomagio/residual/SpreadsheetAbsolutesFactory.py | 2 +-
geomagio/residual/SpreadsheetSummaryFactory.py | 2 +-
geomagio/temperature/StreamTEMPFactory.py | 1 +
geomagio/temperature/TEMPFactory.py | 1 +
geomagio/temperature/__init__.py | 1 +
geomagio/vbf/StreamVBFFactory.py | 1 +
geomagio/vbf/VBFFactory.py | 1 +
geomagio/vbf/__init__.py | 1 +
.../versions/2280fe551e60_initialize_database.py | 1 +
.../4324b87e0b3c_drop_metadata_valid_column.py | 1 +
test/StreamConverter_test.py | 1 +
test/edge_test/MiniSeedFactory_test.py | 1 +
test/imfv283_test/IMFV283Parser_test.py | 1 +
63 files changed, 77 insertions(+), 23 deletions(-)
diff --git a/bin/__init__.py b/bin/__init__.py
index ef7e90169..0db276a14 100644
--- a/bin/__init__.py
+++ b/bin/__init__.py
@@ -1,5 +1,6 @@
"""Module for bin
"""
+
from __future__ import absolute_import
from . import geomag
diff --git a/geomagio/ChannelConverter.py b/geomagio/ChannelConverter.py
index a7c3bfc8b..0ca91bfd7 100644
--- a/geomagio/ChannelConverter.py
+++ b/geomagio/ChannelConverter.py
@@ -16,7 +16,6 @@ Notes: We use numpy functions instead of standard python arithmetic funtions
functions.
"""
-
import numpy
diff --git a/geomagio/PlotTimeseriesFactory.py b/geomagio/PlotTimeseriesFactory.py
index 7cfa3677b..112b11502 100644
--- a/geomagio/PlotTimeseriesFactory.py
+++ b/geomagio/PlotTimeseriesFactory.py
@@ -1,4 +1,5 @@
"""Abstract Timeseries Factory Interface."""
+
from __future__ import absolute_import
from obspy.core import Stream
diff --git a/geomagio/StreamConverter.py b/geomagio/StreamConverter.py
index 4ef3232c5..79ec46cf0 100644
--- a/geomagio/StreamConverter.py
+++ b/geomagio/StreamConverter.py
@@ -6,6 +6,7 @@ Geo: Based on Geographic North. X, Y, Z, F
Obs: Based on the observatories orientaion. H, E, Z, F, d0
Mag: Based on Magnetic North. H, D, Z, F
"""
+
from __future__ import absolute_import
import numpy
diff --git a/geomagio/StreamTimeseriesFactory.py b/geomagio/StreamTimeseriesFactory.py
index 32837aca5..bd95992ea 100644
--- a/geomagio/StreamTimeseriesFactory.py
+++ b/geomagio/StreamTimeseriesFactory.py
@@ -1,4 +1,5 @@
"""Stream wrapper for TimeseriesFactory."""
+
from __future__ import absolute_import
from .TimeseriesFactory import TimeseriesFactory
diff --git a/geomagio/TimeseriesFactory.py b/geomagio/TimeseriesFactory.py
index 06b32c0b8..e2315d29e 100644
--- a/geomagio/TimeseriesFactory.py
+++ b/geomagio/TimeseriesFactory.py
@@ -1,4 +1,5 @@
"""Abstract Timeseries Factory Interface."""
+
from __future__ import absolute_import, print_function
from io import BytesIO
import os
diff --git a/geomagio/TimeseriesUtility.py b/geomagio/TimeseriesUtility.py
index f22ba28d9..9550187c2 100644
--- a/geomagio/TimeseriesUtility.py
+++ b/geomagio/TimeseriesUtility.py
@@ -1,4 +1,5 @@
"""Timeseries Utilities"""
+
from builtins import range
from datetime import datetime
import math
@@ -443,9 +444,11 @@ def unmask_stream(stream):
unmasked = Stream()
for trace in stream:
unmasked += Trace(
- trace.data.filled(fill_value=numpy.nan)
- if isinstance(trace.data, numpy.ma.MaskedArray)
- else trace.data,
+ (
+ trace.data.filled(fill_value=numpy.nan)
+ if isinstance(trace.data, numpy.ma.MaskedArray)
+ else trace.data
+ ),
trace.stats,
)
return unmasked
diff --git a/geomagio/algorithm/AverageAlgorithm.py b/geomagio/algorithm/AverageAlgorithm.py
index 70588de81..9d867aff4 100644
--- a/geomagio/algorithm/AverageAlgorithm.py
+++ b/geomagio/algorithm/AverageAlgorithm.py
@@ -1,6 +1,7 @@
"""Algorithm that creates an averaged Dst.
"""
+
from __future__ import absolute_import
from .Algorithm import Algorithm
diff --git a/geomagio/algorithm/DeltaFAlgorithm.py b/geomagio/algorithm/DeltaFAlgorithm.py
index 22ebab009..a89a99774 100644
--- a/geomagio/algorithm/DeltaFAlgorithm.py
+++ b/geomagio/algorithm/DeltaFAlgorithm.py
@@ -1,6 +1,7 @@
"""Algorithm that creates a deltaf
"""
+
from __future__ import absolute_import
from .Algorithm import Algorithm
diff --git a/geomagio/algorithm/SqDistAlgorithm.py b/geomagio/algorithm/SqDistAlgorithm.py
index e2106c0fa..246baa05d 100644
--- a/geomagio/algorithm/SqDistAlgorithm.py
+++ b/geomagio/algorithm/SqDistAlgorithm.py
@@ -11,6 +11,7 @@
Use of fmin_l_bfgs_b to estimate parameters inspired by Andre Queiroz:
https://gist.github.com/andrequeiroz/5888967
"""
+
from __future__ import absolute_import, print_function
from .. import StreamConverter
diff --git a/geomagio/algorithm/XYZAlgorithm.py b/geomagio/algorithm/XYZAlgorithm.py
index 1f43c8785..6ca008f4e 100644
--- a/geomagio/algorithm/XYZAlgorithm.py
+++ b/geomagio/algorithm/XYZAlgorithm.py
@@ -2,6 +2,7 @@
related coordinate system.
"""
+
from __future__ import absolute_import
from .Algorithm import Algorithm
diff --git a/geomagio/algorithm/__init__.py b/geomagio/algorithm/__init__.py
index 1008dceab..0d56bbcdd 100644
--- a/geomagio/algorithm/__init__.py
+++ b/geomagio/algorithm/__init__.py
@@ -1,6 +1,7 @@
"""
Geomag Algorithms module
"""
+
from __future__ import absolute_import
# base classes
diff --git a/geomagio/api/app.py b/geomagio/api/app.py
index 618fe8edd..6cf83e96b 100644
--- a/geomagio/api/app.py
+++ b/geomagio/api/app.py
@@ -6,6 +6,7 @@ and can be run using uvicorn, or any other ASGI server:
uvicorn geomagio.api:app
"""
+
import logging
import os
diff --git a/geomagio/api/secure/__init__.py b/geomagio/api/secure/__init__.py
index 2c745c5c1..6684194ce 100644
--- a/geomagio/api/secure/__init__.py
+++ b/geomagio/api/secure/__init__.py
@@ -1,5 +1,6 @@
"""Module with application for "/ws/secure" endpoints.
"""
+
from .app import app
__all__ = ["app"]
diff --git a/geomagio/api/secure/login.py b/geomagio/api/secure/login.py
index ecd0c7ab8..f89da89c6 100644
--- a/geomagio/api/secure/login.py
+++ b/geomagio/api/secure/login.py
@@ -33,6 +33,7 @@ Usage:
/logout - logout current user
/user - access current user information as json
"""
+
import logging
import os
from typing import Callable, List, Optional
diff --git a/geomagio/api/secure/metadata.py b/geomagio/api/secure/metadata.py
index e5acb0849..fb0f8b6e2 100644
--- a/geomagio/api/secure/metadata.py
+++ b/geomagio/api/secure/metadata.py
@@ -13,6 +13,7 @@ Configuration:
ADMIN_GROUP - delete is restricted the admin group.
REVIEWER_GROUP - update is restricted the reviewer group.
"""
+
import os
from typing import List
diff --git a/geomagio/api/ws/Observatory.py b/geomagio/api/ws/Observatory.py
index d45c2aff5..85df1e586 100644
--- a/geomagio/api/ws/Observatory.py
+++ b/geomagio/api/ws/Observatory.py
@@ -73,12 +73,14 @@ class Observatory(BaseModel):
"sensor_sampling_rate": 0.01,
"declination_base": self.declination_base,
},
- "geometry": {
- "type": "Point",
- "coordinates": [self.longitude, self.latitude, self.elevation],
- }
- if self.name != "USGS"
- else None, # no geojson for USGS(virtual observatory)
+ "geometry": (
+ {
+ "type": "Point",
+ "coordinates": [self.longitude, self.latitude, self.elevation],
+ }
+ if self.name != "USGS"
+ else None
+ ), # no geojson for USGS(virtual observatory)
}
diff --git a/geomagio/api/ws/__init__.py b/geomagio/api/ws/__init__.py
index 125ea3af7..cd87bf0b8 100644
--- a/geomagio/api/ws/__init__.py
+++ b/geomagio/api/ws/__init__.py
@@ -1,5 +1,6 @@
"""Module with application for "/ws" endpoints.
"""
+
from .app import app
__all__ = ["app"]
diff --git a/geomagio/api/ws/app.py b/geomagio/api/ws/app.py
index 71f02b194..4f3612c92 100644
--- a/geomagio/api/ws/app.py
+++ b/geomagio/api/ws/app.py
@@ -45,9 +45,9 @@ if METADATA_ENDPOINT:
@app.middleware("http")
async def add_headers(request: Request, call_next):
response = await call_next(request)
- response.headers[
- "Access-Control-Allow-Headers"
- ] = "accept, origin, authorization, content-type"
+ response.headers["Access-Control-Allow-Headers"] = (
+ "accept, origin, authorization, content-type"
+ )
response.headers["Access-Control-Allow-Methods"] = "*"
response.headers["Access-Control-Allow-Origin"] = "*"
response.headers["Cache-Control"] = "max-age=60"
diff --git a/geomagio/binlog/BinLogFactory.py b/geomagio/binlog/BinLogFactory.py
index dbe5b882f..74d48f382 100644
--- a/geomagio/binlog/BinLogFactory.py
+++ b/geomagio/binlog/BinLogFactory.py
@@ -1,4 +1,5 @@
"""Factory that creates BinLog Files."""
+
from __future__ import absolute_import
from ..TimeseriesFactory import TimeseriesFactory
diff --git a/geomagio/binlog/StreamBinLogFactory.py b/geomagio/binlog/StreamBinLogFactory.py
index c7c723b40..590488568 100644
--- a/geomagio/binlog/StreamBinLogFactory.py
+++ b/geomagio/binlog/StreamBinLogFactory.py
@@ -1,4 +1,5 @@
"""Factory to load BinLog files from an input StreamBinLogFactory."""
+
from __future__ import absolute_import
from .BinLogFactory import BinLogFactory
diff --git a/geomagio/binlog/__init__.py b/geomagio/binlog/__init__.py
index 5fd9eb78c..5928f63f9 100644
--- a/geomagio/binlog/__init__.py
+++ b/geomagio/binlog/__init__.py
@@ -1,5 +1,6 @@
"""IO Module for BinLog Format
"""
+
from __future__ import absolute_import
from .BinLogFactory import BinLogFactory
diff --git a/geomagio/biq/BIQFactory.py b/geomagio/biq/BIQFactory.py
index 59d0117a4..33e76997d 100644
--- a/geomagio/biq/BIQFactory.py
+++ b/geomagio/biq/BIQFactory.py
@@ -1,4 +1,5 @@
"""Factory that parses BIQ files into arrays and/or ObsPy Stream."""
+
import numpy as np
import obspy
diff --git a/geomagio/edge/EdgeFactory.py b/geomagio/edge/EdgeFactory.py
index 70d97eea9..f46119396 100644
--- a/geomagio/edge/EdgeFactory.py
+++ b/geomagio/edge/EdgeFactory.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
from datetime import datetime
import sys
diff --git a/geomagio/edge/MiniSeedFactory.py b/geomagio/edge/MiniSeedFactory.py
index 1c898c637..5de50c1ab 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
diff --git a/geomagio/edge/RawInputClient.py b/geomagio/edge/RawInputClient.py
index e6483c7fa..55eae89c9 100644
--- a/geomagio/edge/RawInputClient.py
+++ b/geomagio/edge/RawInputClient.py
@@ -42,7 +42,6 @@ FORCEOUT = -2
class RawInputClient:
-
"""RawInputClient for direct to edge data.
Parameters
----------
diff --git a/geomagio/edge/__init__.py b/geomagio/edge/__init__.py
index de13ae407..e8a4117e3 100644
--- a/geomagio/edge/__init__.py
+++ b/geomagio/edge/__init__.py
@@ -1,5 +1,6 @@
"""IO Module for Edge Format
"""
+
from __future__ import absolute_import
from .EdgeFactory import EdgeFactory
diff --git a/geomagio/iaga2002/IAGA2002Factory.py b/geomagio/iaga2002/IAGA2002Factory.py
index a03b8bcba..d58e0625c 100644
--- a/geomagio/iaga2002/IAGA2002Factory.py
+++ b/geomagio/iaga2002/IAGA2002Factory.py
@@ -1,4 +1,5 @@
"""Factory that loads IAGA2002 Files."""
+
from __future__ import absolute_import
import obspy.core
diff --git a/geomagio/iaga2002/IAGA2002Parser.py b/geomagio/iaga2002/IAGA2002Parser.py
index efbfdc3c8..7e861157f 100644
--- a/geomagio/iaga2002/IAGA2002Parser.py
+++ b/geomagio/iaga2002/IAGA2002Parser.py
@@ -1,6 +1,5 @@
"""Parsing methods for the IAGA2002 Format."""
-
import numpy
from datetime import datetime
diff --git a/geomagio/iaga2002/StreamIAGA2002Factory.py b/geomagio/iaga2002/StreamIAGA2002Factory.py
index eb1625f62..73f3d58f0 100644
--- a/geomagio/iaga2002/StreamIAGA2002Factory.py
+++ b/geomagio/iaga2002/StreamIAGA2002Factory.py
@@ -1,4 +1,5 @@
"""Factory to load IAGA2002 files from an input StreamIAGA2002Factory."""
+
from __future__ import absolute_import
from .IAGA2002Factory import IAGA2002Factory
diff --git a/geomagio/iaga2002/__init__.py b/geomagio/iaga2002/__init__.py
index 66644b451..0a9617eff 100644
--- a/geomagio/iaga2002/__init__.py
+++ b/geomagio/iaga2002/__init__.py
@@ -3,6 +3,7 @@
Based on documentation at:
https://www.ngdc.noaa.gov/IAGA/vdat/IAGA2002/iaga2002format.html
"""
+
from __future__ import absolute_import
from .IAGA2002Factory import IAGA2002Factory
diff --git a/geomagio/imfjson/IMFJSONFactory.py b/geomagio/imfjson/IMFJSONFactory.py
index c50dea1c2..048647ccf 100644
--- a/geomagio/imfjson/IMFJSONFactory.py
+++ b/geomagio/imfjson/IMFJSONFactory.py
@@ -1,4 +1,5 @@
"""Factory for json files."""
+
from __future__ import absolute_import
from ..TimeseriesFactory import TimeseriesFactory
diff --git a/geomagio/imfjson/__init__.py b/geomagio/imfjson/__init__.py
index 3125b4e8e..8cec78d55 100644
--- a/geomagio/imfjson/__init__.py
+++ b/geomagio/imfjson/__init__.py
@@ -1,5 +1,6 @@
"""IO Module for IMFSONFactory Format
"""
+
from __future__ import absolute_import
from .IMFJSONFactory import IMFJSONFactory
diff --git a/geomagio/imfv122/IMFV122Factory.py b/geomagio/imfv122/IMFV122Factory.py
index dfdf0c48c..e66f95e1e 100644
--- a/geomagio/imfv122/IMFV122Factory.py
+++ b/geomagio/imfv122/IMFV122Factory.py
@@ -1,4 +1,5 @@
"""Factory that loads IMFV122 Files."""
+
from __future__ import absolute_import
import obspy.core
diff --git a/geomagio/imfv122/IMFV122Parser.py b/geomagio/imfv122/IMFV122Parser.py
index 1e4959414..09df4262d 100644
--- a/geomagio/imfv122/IMFV122Parser.py
+++ b/geomagio/imfv122/IMFV122Parser.py
@@ -1,6 +1,5 @@
"""Parsing methods for the IMFV122 Format."""
-
import numpy
from obspy.core import UTCDateTime
diff --git a/geomagio/imfv122/StreamIMFV122Factory.py b/geomagio/imfv122/StreamIMFV122Factory.py
index 4a9575fc9..a50cb332d 100644
--- a/geomagio/imfv122/StreamIMFV122Factory.py
+++ b/geomagio/imfv122/StreamIMFV122Factory.py
@@ -1,4 +1,5 @@
"""Factory to load IMFV122 files from an input stream."""
+
from __future__ import absolute_import
from .IMFV122Factory import IMFV122Factory
diff --git a/geomagio/imfv122/__init__.py b/geomagio/imfv122/__init__.py
index 8044f6a7b..dc6129d4f 100644
--- a/geomagio/imfv122/__init__.py
+++ b/geomagio/imfv122/__init__.py
@@ -3,6 +3,7 @@
Based on documentation at:
http://www.intermagnet.org/data-donnee/formats/imfv122-eng.php
"""
+
from __future__ import absolute_import
from .IMFV122Factory import IMFV122Factory
diff --git a/geomagio/imfv283/GOESIMFV283Factory.py b/geomagio/imfv283/GOESIMFV283Factory.py
index 195e87105..6c35be4da 100644
--- a/geomagio/imfv283/GOESIMFV283Factory.py
+++ b/geomagio/imfv283/GOESIMFV283Factory.py
@@ -1,4 +1,5 @@
"""Factory to load IMFV283 files from an input StreamIMFV283Factory."""
+
from __future__ import absolute_import, print_function, unicode_literals
from .IMFV283Factory import IMFV283Factory
diff --git a/geomagio/imfv283/IMFV283Factory.py b/geomagio/imfv283/IMFV283Factory.py
index f2c9d2eff..9f6b2f4ea 100644
--- a/geomagio/imfv283/IMFV283Factory.py
+++ b/geomagio/imfv283/IMFV283Factory.py
@@ -1,4 +1,5 @@
"""Factory that loads IAGA2002 Files."""
+
from __future__ import absolute_import
import numpy
diff --git a/geomagio/imfv283/IMFV283Parser.py b/geomagio/imfv283/IMFV283Parser.py
index b9ae70270..cf1b03215 100644
--- a/geomagio/imfv283/IMFV283Parser.py
+++ b/geomagio/imfv283/IMFV283Parser.py
@@ -1,4 +1,5 @@
"""Parsing methods for the IMFV283 Format."""
+
from __future__ import absolute_import, unicode_literals
from builtins import range, str
diff --git a/geomagio/imfv283/StreamIMFV283Factory.py b/geomagio/imfv283/StreamIMFV283Factory.py
index 402f0e2c3..905b3ab89 100644
--- a/geomagio/imfv283/StreamIMFV283Factory.py
+++ b/geomagio/imfv283/StreamIMFV283Factory.py
@@ -1,4 +1,5 @@
"""Factory to load IMFV283 files from an input StreamIMFV283Factory."""
+
from __future__ import absolute_import
from .IMFV283Factory import IMFV283Factory
diff --git a/geomagio/imfv283/__init__.py b/geomagio/imfv283/__init__.py
index de3a6aeb8..9a38dcfda 100644
--- a/geomagio/imfv283/__init__.py
+++ b/geomagio/imfv283/__init__.py
@@ -3,6 +3,7 @@
Based on documentation at:
http://http://www.intermagnet.org/data-donnee/formats/imfv283e-eng.php
"""
+
from __future__ import absolute_import
from .GOESIMFV283Factory import GOESIMFV283Factory
diff --git a/geomagio/metadata/MetadataCategory.py b/geomagio/metadata/MetadataCategory.py
index 44c5608b6..bb33eda18 100644
--- a/geomagio/metadata/MetadataCategory.py
+++ b/geomagio/metadata/MetadataCategory.py
@@ -1,5 +1,6 @@
from enum import Enum
+
# known category values as enumeration
class MetadataCategory(str, Enum):
ADJUSTED_MATRIX = "adjusted-matrix"
diff --git a/geomagio/pcdcp/PCDCPFactory.py b/geomagio/pcdcp/PCDCPFactory.py
index f7633d2c0..217fa5dec 100644
--- a/geomagio/pcdcp/PCDCPFactory.py
+++ b/geomagio/pcdcp/PCDCPFactory.py
@@ -1,4 +1,5 @@
"""Factory that loads PCDCP Files."""
+
from __future__ import absolute_import
import obspy.core
diff --git a/geomagio/pcdcp/PCDCPParser.py b/geomagio/pcdcp/PCDCPParser.py
index 176b38941..1f5ad2ba6 100644
--- a/geomagio/pcdcp/PCDCPParser.py
+++ b/geomagio/pcdcp/PCDCPParser.py
@@ -1,6 +1,5 @@
"""Parsing methods for the PCDCP Format."""
-
import numpy
# values that represent missing data points in PCDCP
@@ -93,7 +92,7 @@ class PCDCPParser(object):
Adds channel values to ``self.data``.
"""
values = line.split()
- for (value, column) in zip(values, self._parsedata):
+ for value, column in zip(values, self._parsedata):
column.append(value)
def _post_process(self):
diff --git a/geomagio/pcdcp/PCDCPWriter.py b/geomagio/pcdcp/PCDCPWriter.py
index f974a8b3e..ebc393dc8 100644
--- a/geomagio/pcdcp/PCDCPWriter.py
+++ b/geomagio/pcdcp/PCDCPWriter.py
@@ -193,9 +193,11 @@ class PCDCPWriter(object):
totalMinutes,
tw=time_width,
*[
- self.empty_value
- if numpy.isnan(val)
- else int(round(val * data_multiplier))
+ (
+ self.empty_value
+ if numpy.isnan(val)
+ else int(round(val * data_multiplier))
+ )
for val in values
],
dw=data_width
diff --git a/geomagio/pcdcp/StreamPCDCPFactory.py b/geomagio/pcdcp/StreamPCDCPFactory.py
index ba52bb6be..a37e3d890 100644
--- a/geomagio/pcdcp/StreamPCDCPFactory.py
+++ b/geomagio/pcdcp/StreamPCDCPFactory.py
@@ -1,4 +1,5 @@
"""Factory to load PCDCP files from an input StreamPCDCPFactory."""
+
from __future__ import absolute_import
from .PCDCPFactory import PCDCPFactory
diff --git a/geomagio/pcdcp/__init__.py b/geomagio/pcdcp/__init__.py
index fd88ed7f4..308618e29 100644
--- a/geomagio/pcdcp/__init__.py
+++ b/geomagio/pcdcp/__init__.py
@@ -1,5 +1,6 @@
"""IO Module for PCDCP Format
"""
+
from __future__ import absolute_import
from .PCDCPFactory import PCDCPFactory, PCDCP_FILE_PATTERN
diff --git a/geomagio/processing/__init__.py b/geomagio/processing/__init__.py
index 573ec1ae8..a31e13c3b 100644
--- a/geomagio/processing/__init__.py
+++ b/geomagio/processing/__init__.py
@@ -3,6 +3,7 @@
Note that these implementations are subject to change,
and should be considered less stable than other packages in the library.
"""
+
from .factory import get_edge_factory, get_miniseed_factory
from .derived import adjusted, average, sqdist_minute
from .filters import minute_filter, second_filter
diff --git a/geomagio/residual/CalFileFactory.py b/geomagio/residual/CalFileFactory.py
index 5b626ca2f..8e5f12df4 100644
--- a/geomagio/residual/CalFileFactory.py
+++ b/geomagio/residual/CalFileFactory.py
@@ -1,5 +1,6 @@
"""Factory for CalFiles, used by MagProc.
"""
+
from __future__ import print_function
from typing import List
diff --git a/geomagio/residual/SpreadsheetAbsolutesFactory.py b/geomagio/residual/SpreadsheetAbsolutesFactory.py
index a2daffed7..a3dfd7630 100644
--- a/geomagio/residual/SpreadsheetAbsolutesFactory.py
+++ b/geomagio/residual/SpreadsheetAbsolutesFactory.py
@@ -323,7 +323,7 @@ class SpreadsheetAbsolutesFactory(object):
end_filename = f"{observatory}-{endtime.datetime:%Y%j%H%M}.xlsm"
all_dirs = []
all_files = []
- for (dirpath, _, filenames) in os.walk(self.base_directory):
+ for dirpath, _, filenames in os.walk(self.base_directory):
# accumulate dirpaths and filenames before sorting on filenames
all_dirs += len(filenames) * [dirpath]
all_files += filenames
diff --git a/geomagio/residual/SpreadsheetSummaryFactory.py b/geomagio/residual/SpreadsheetSummaryFactory.py
index 3ed439325..ae454d3f1 100644
--- a/geomagio/residual/SpreadsheetSummaryFactory.py
+++ b/geomagio/residual/SpreadsheetSummaryFactory.py
@@ -62,7 +62,7 @@ class SpreadsheetSummaryFactory(object):
end_filename = f"{observatory}{endtime.datetime:%Y%j%H%M}.xlsm"
all_dirs = []
all_files = []
- for (dirpath, _, filenames) in os.walk(self.base_directory):
+ for dirpath, _, filenames in os.walk(self.base_directory):
# accumulate dirpaths and filenames before sorting on filenames
all_dirs += len(filenames) * [dirpath]
all_files += filenames
diff --git a/geomagio/temperature/StreamTEMPFactory.py b/geomagio/temperature/StreamTEMPFactory.py
index 356f6a598..734a2d61c 100644
--- a/geomagio/temperature/StreamTEMPFactory.py
+++ b/geomagio/temperature/StreamTEMPFactory.py
@@ -1,4 +1,5 @@
"""Factory to load temp/volt files from an input StreamTEMPFactory."""
+
from __future__ import absolute_import
from .TEMPFactory import TEMPFactory
diff --git a/geomagio/temperature/TEMPFactory.py b/geomagio/temperature/TEMPFactory.py
index fad62a976..b0a37ab50 100644
--- a/geomagio/temperature/TEMPFactory.py
+++ b/geomagio/temperature/TEMPFactory.py
@@ -1,4 +1,5 @@
"""Factory that loads temp/volt Files."""
+
from __future__ import absolute_import
from ..TimeseriesFactory import TimeseriesFactory
diff --git a/geomagio/temperature/__init__.py b/geomagio/temperature/__init__.py
index 77e464af4..7b64a57f7 100644
--- a/geomagio/temperature/__init__.py
+++ b/geomagio/temperature/__init__.py
@@ -1,5 +1,6 @@
"""IO Module for TEMP Format
"""
+
from __future__ import absolute_import
from .TEMPFactory import TEMPFactory
diff --git a/geomagio/vbf/StreamVBFFactory.py b/geomagio/vbf/StreamVBFFactory.py
index a8962c630..86e0f85ad 100644
--- a/geomagio/vbf/StreamVBFFactory.py
+++ b/geomagio/vbf/StreamVBFFactory.py
@@ -1,4 +1,5 @@
"""Factory to load VBF files from an input StreamVBFFactory."""
+
from __future__ import absolute_import
from .VBFFactory import VBFFactory
diff --git a/geomagio/vbf/VBFFactory.py b/geomagio/vbf/VBFFactory.py
index 5d96582b2..3466a833b 100644
--- a/geomagio/vbf/VBFFactory.py
+++ b/geomagio/vbf/VBFFactory.py
@@ -1,4 +1,5 @@
"""Factory that loads VBF Files."""
+
from __future__ import absolute_import
from ..TimeseriesFactory import TimeseriesFactory
diff --git a/geomagio/vbf/__init__.py b/geomagio/vbf/__init__.py
index 355a551bd..f0b694de1 100644
--- a/geomagio/vbf/__init__.py
+++ b/geomagio/vbf/__init__.py
@@ -1,5 +1,6 @@
"""IO Module for VBF Format
"""
+
from __future__ import absolute_import
from .VBFFactory import VBFFactory
diff --git a/migrations/versions/2280fe551e60_initialize_database.py b/migrations/versions/2280fe551e60_initialize_database.py
index 01c9d26b4..0e2fe978e 100644
--- a/migrations/versions/2280fe551e60_initialize_database.py
+++ b/migrations/versions/2280fe551e60_initialize_database.py
@@ -5,6 +5,7 @@ Revises:
Create Date: 2021-04-22 13:06:28.852803
"""
+
from alembic import op
from geomagio.api.db.create import create_db
diff --git a/migrations/versions/4324b87e0b3c_drop_metadata_valid_column.py b/migrations/versions/4324b87e0b3c_drop_metadata_valid_column.py
index 4bf200c01..d62dd9fc6 100644
--- a/migrations/versions/4324b87e0b3c_drop_metadata_valid_column.py
+++ b/migrations/versions/4324b87e0b3c_drop_metadata_valid_column.py
@@ -5,6 +5,7 @@ Revises: 2280fe551e60
Create Date: 2021-07-14 15:48:32.154022
"""
+
from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import mysql
diff --git a/test/StreamConverter_test.py b/test/StreamConverter_test.py
index 446a4b553..3fb1ee376 100644
--- a/test/StreamConverter_test.py
+++ b/test/StreamConverter_test.py
@@ -9,6 +9,7 @@ We are using triangle identities for variables to test with. Specifically
For more info on the components see the Notes in ChannelConverterTest.py.
"""
+
import obspy.core
import numpy
from geomagio import ChannelConverter, StreamConverter
diff --git a/test/edge_test/MiniSeedFactory_test.py b/test/edge_test/MiniSeedFactory_test.py
index 6b0dbbd91..3b8ced3b0 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
diff --git a/test/imfv283_test/IMFV283Parser_test.py b/test/imfv283_test/IMFV283Parser_test.py
index 61d5f92b1..fb7e5395a 100644
--- a/test/imfv283_test/IMFV283Parser_test.py
+++ b/test/imfv283_test/IMFV283Parser_test.py
@@ -1,4 +1,5 @@
"""Tests for the IMFV283 Parser class."""
+
from __future__ import unicode_literals
from numpy.testing import assert_equal
--
GitLab