Ruff

Author: thodson-usgs

dataretrieval/nwis.py

@@ -494,7 +494,6 @@ def get_dv(
     return format_response(df, **kwargs), NWIS_Metadata(response, **kwargs)
 
 
-
 def get_info(ssl_check: bool = True, **kwargs) -> tuple[pd.DataFrame, BaseMetadata]:
     """
     Get site description information from NWIS.
@@ -688,7 +687,6 @@ def get_iv(
     return format_response(df, **kwargs), NWIS_Metadata(response, **kwargs)
 
 
-
 def get_pmcodes(
     parameterCd: str | list[str] = "All",
     partial: bool = True,

dataretrieval/utils.py

@@ -218,7 +218,6 @@ def query(url, payload, delimiter=",", ssl_check=True):
             + f"The service at {response.url} may be down or experiencing issues."
         )
 
-
     if response.text.startswith("No sites/data"):
         raise NoSitesError(response.url)
 

tests/nwis_test.py

@@ -32,7 +32,7 @@ def _test_iv_service(requests_mock):
     end = END_DATE
     service = "iv"
     site = ["03339000", "05447500", "03346500"]
-    
+
     # Minimal mock response
     mock_url = (
         "https://waterservices.usgs.gov/nwis/iv?format=json&"
@@ -44,20 +44,48 @@ def _test_iv_service(requests_mock):
             "timeSeries": [
                 {
                     "sourceInfo": {"siteCode": [{"value": "03339000"}]},
-                    "variable": {"variableCode": [{"value": "00060"}], "options": {"option": [{"value": "mean"}]}},
-                    "values": [{"method": [{"methodDescription": "mean"}], "value": [{"value": "1.0", "dateTime": "2018-01-24T00:00:00Z", "qualifiers": "A"}]}]
+                    "variable": {
+                        "variableCode": [{"value": "00060"}],
+                        "options": {"option": [{"value": "mean"}]},
+                    },
+                    "values": [
+                        {
+                            "method": [{"methodDescription": "mean"}],
+                            "value": [
+                                {
+                                    "value": "1.0",
+                                    "dateTime": "2018-01-24T00:00:00Z",
+                                    "qualifiers": "A",
+                                }
+                            ],
+                        }
+                    ],
                 },
                 {
                     "sourceInfo": {"siteCode": [{"value": "05447500"}]},
-                    "variable": {"variableCode": [{"value": "00060"}], "options": {"option": [{"value": "mean"}]}},
-                    "values": [{"method": [{"methodDescription": "mean"}], "value": [{"value": "2.0", "dateTime": "2018-01-24T00:00:00Z", "qualifiers": "A"}]}]
-                }
+                    "variable": {
+                        "variableCode": [{"value": "00060"}],
+                        "options": {"option": [{"value": "mean"}]},
+                    },
+                    "values": [
+                        {
+                            "method": [{"methodDescription": "mean"}],
+                            "value": [
+                                {
+                                    "value": "2.0",
+                                    "dateTime": "2018-01-24T00:00:00Z",
+                                    "qualifiers": "A",
+                                }
+                            ],
+                        }
+                    ],
+                },
             ]
         }
     }
 
     requests_mock.get(mock_url, json=mock_json)
-    
+
     return get_record(site, start, end, service=service)
 
 
@@ -88,7 +116,6 @@ def test_nwis_service_live():
         raise e
 
 
-
 def test_preformat_peaks_response():
     # make a data frame with a "peak_dt" datetime column
     # it will have some nan and none values
@@ -154,7 +181,6 @@ def test_get_record_defunct_service_water_use(self):
             get_record(service="water_use")
 
 
-
 class TestTZ:
     """Tests relating to GitHub Issue #60."""
 
@@ -232,19 +258,16 @@ def test_empty_timeseries(requests_mock):
     sites = "011277906"
     start = "2010-07-20"
     end = "2010-07-20"
-    
+
     mock_url = (
         f"https://waterservices.usgs.gov/nwis/iv?format=json&"
         f"startDT={start}&endDT={end}&sites={sites}"
     )
     mock_json = {"value": {"timeSeries": []}}
     requests_mock.get(mock_url, json=mock_json)
-    
-    df = get_record(
-        sites=sites, service="iv", start=start, end=end
-    )
-    assert df.empty is True
 
+    df = get_record(sites=sites, service="iv", start=start, end=end)
+    assert df.empty is True
 
 
 class TestMetaData: