From 55595c27424d29bc8d503350e7d1e33e8f69a9ff Mon Sep 17 00:00:00 2001
From: Travis Rivers <trivers@contractor.usgs.gov>
Date: Thu, 27 Aug 2020 11:57:11 -0600
Subject: [PATCH] change black formatter version
---
.pre-commit-config.yaml | 6 +++---
geomagio/algorithm/AdjustedAlgorithm.py | 4 +++-
geomagio/api/secure/SessionMiddleware.py | 5 ++++-
geomagio/api/secure/login.py | 4 +++-
geomagio/api/secure/metadata.py | 4 +++-
geomagio/api/ws/Element.py | 5 ++++-
geomagio/edge/EdgeFactory.py | 9 ++++++++-
geomagio/pcdcp/PCDCPFactory.py | 4 +++-
geomagio/processing/magproc.py | 5 ++++-
geomagio/residual/SpreadsheetAbsolutesFactory.py | 3 ++-
setup.py | 4 +++-
11 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 087d0de67..6b5dbc4f7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,5 +1,5 @@
repos:
-- repo: https://github.com/ambv/black
- rev: stable
+ - repo: https://github.com/ambv/black
+ rev: 20.8b1
hooks:
- - id: black
+ - id: black
diff --git a/geomagio/algorithm/AdjustedAlgorithm.py b/geomagio/algorithm/AdjustedAlgorithm.py
index 0c1bbf2f6..601bad244 100644
--- a/geomagio/algorithm/AdjustedAlgorithm.py
+++ b/geomagio/algorithm/AdjustedAlgorithm.py
@@ -27,7 +27,9 @@ class AdjustedAlgorithm(Algorithm):
inchannels = inchannels or ["H", "E", "Z", "F"]
outchannels = outchannels or ["X", "Y", "Z", "F"]
Algorithm.__init__(
- self, inchannels=inchannels, outchannels=outchannels,
+ self,
+ inchannels=inchannels,
+ outchannels=outchannels,
)
# state variables
self.matrix = matrix
diff --git a/geomagio/api/secure/SessionMiddleware.py b/geomagio/api/secure/SessionMiddleware.py
index d4ef2090b..c757c8b33 100644
--- a/geomagio/api/secure/SessionMiddleware.py
+++ b/geomagio/api/secure/SessionMiddleware.py
@@ -110,7 +110,10 @@ class SessionMiddleware:
await self.save_session_callback(session_id, data)
def set_cookie(
- self, message: Message, value: str, max_age: int = None,
+ self,
+ message: Message,
+ value: str,
+ max_age: int = None,
):
headers = MutableHeaders(scope=message)
headers.append("Cache-Control")
diff --git a/geomagio/api/secure/login.py b/geomagio/api/secure/login.py
index 334264d28..c3407d931 100644
--- a/geomagio/api/secure/login.py
+++ b/geomagio/api/secure/login.py
@@ -67,7 +67,9 @@ async def current_user(request: Request) -> Optional[User]:
return None
-def require_user(allowed_groups: List[str] = None,) -> Callable[[Request, User], User]:
+def require_user(
+ allowed_groups: List[str] = None,
+) -> Callable[[Request, User], User]:
"""Create function to verifies user in allowed_groups
Usage example:
diff --git a/geomagio/api/secure/metadata.py b/geomagio/api/secure/metadata.py
index 5e4f08462..fb0dfc4cf 100644
--- a/geomagio/api/secure/metadata.py
+++ b/geomagio/api/secure/metadata.py
@@ -31,7 +31,9 @@ router = APIRouter()
@router.post("/metadata", response_model=Metadata)
async def create_metadata(
- request: Request, metadata: Metadata, user: User = Depends(require_user()),
+ request: Request,
+ metadata: Metadata,
+ user: User = Depends(require_user()),
):
metadata = await metadata_table.create_metadata(metadata)
return Response(metadata, status_code=201, media_type="application/json")
diff --git a/geomagio/api/ws/Element.py b/geomagio/api/ws/Element.py
index eff80cca9..952feae90 100644
--- a/geomagio/api/ws/Element.py
+++ b/geomagio/api/ws/Element.py
@@ -24,7 +24,10 @@ ELEMENTS = [
Element(id="SQ", name="Solar Quiet", units="nT"),
Element(id="SV", name="Solar Variation", units="nT"),
Element(
- id="UK1", abbreviation="T-Electric", name="Electronics Temperature", units="°C",
+ id="UK1",
+ abbreviation="T-Electric",
+ name="Electronics Temperature",
+ units="°C",
),
Element(
id="UK2",
diff --git a/geomagio/edge/EdgeFactory.py b/geomagio/edge/EdgeFactory.py
index 83c278a6e..a22514650 100644
--- a/geomagio/edge/EdgeFactory.py
+++ b/geomagio/edge/EdgeFactory.py
@@ -544,7 +544,14 @@ class EdgeFactory(TimeseriesFactory):
TimeseriesUtility.pad_timeseries(timeseries, starttime, endtime)
def _put_channel(
- self, timeseries, observatory, channel, type, interval, starttime, endtime,
+ self,
+ timeseries,
+ observatory,
+ channel,
+ type,
+ interval,
+ starttime,
+ endtime,
):
"""Put a channel worth of data
diff --git a/geomagio/pcdcp/PCDCPFactory.py b/geomagio/pcdcp/PCDCPFactory.py
index 5941528de..f7633d2c0 100644
--- a/geomagio/pcdcp/PCDCPFactory.py
+++ b/geomagio/pcdcp/PCDCPFactory.py
@@ -36,7 +36,9 @@ class PCDCPFactory(TimeseriesFactory):
"""
def __init__(
- self, temperatures=False, **kwargs,
+ self,
+ temperatures=False,
+ **kwargs,
):
TimeseriesFactory.__init__(self, **kwargs)
self.temperatures = temperatures
diff --git a/geomagio/processing/magproc.py b/geomagio/processing/magproc.py
index 1522e311e..14f2fc744 100644
--- a/geomagio/processing/magproc.py
+++ b/geomagio/processing/magproc.py
@@ -69,7 +69,10 @@ def prepfiles(
def write_cal_file(
- starttime: UTCDateTime, endtime: UTCDateTime, observatory: str, template: str,
+ starttime: UTCDateTime,
+ endtime: UTCDateTime,
+ observatory: str,
+ template: str,
):
print(
f"Loading calibration data for {observatory} [{starttime}, {endtime}]",
diff --git a/geomagio/residual/SpreadsheetAbsolutesFactory.py b/geomagio/residual/SpreadsheetAbsolutesFactory.py
index 481216773..d53b772bd 100644
--- a/geomagio/residual/SpreadsheetAbsolutesFactory.py
+++ b/geomagio/residual/SpreadsheetAbsolutesFactory.py
@@ -288,7 +288,8 @@ class SpreadsheetAbsolutesFactory(object):
return Reading(
absolutes=absolutes,
azimuth=Angle.from_dms(
- degrees=int(mark_azimuth / 100.0), minutes=mark_azimuth % 100,
+ degrees=int(mark_azimuth / 100.0),
+ minutes=mark_azimuth % 100,
),
hemisphere=metadata["hemisphere"],
measurements=measurements,
diff --git a/setup.py b/setup.py
index b923235ec..29212231e 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,9 @@ setuptools.setup(
},
python_requires=">=3.6, <4",
scripts=["bin/geomag.py", "bin/geomag_webservice.py", "bin/make_cal.py"],
- setup_requires=["setuptools-pipfile",],
+ setup_requires=[
+ "setuptools-pipfile",
+ ],
use_pipfile=True,
entry_points={
"console_scripts": ["magproc-prepfiles=geomagio.processing.magproc:main"],
--
GitLab