Update ruff config

Author: nodohs

.pre-commit-config.yaml

@@ -22,26 +22,11 @@ repos:
         args:
           - '--py38-plus'
 
-  - repo: https://github.com/psf/black
-    rev: 23.3.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.15.6
     hooks:
-      - id: black
-      - id: black-jupyter
-
-  - repo: https://github.com/keewis/blackdoc
-    rev: v0.3.8
-    hooks:
-      - id: blackdoc
-
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
-    hooks:
-      - id: flake8
-
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
+      - id: ruff-check
+      - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.0.0-alpha.6

dataretrieval/__init__.py

@@ -5,11 +5,11 @@
 except PackageNotFoundError:
     __version__ = "version-unknown"
 
-from dataretrieval.nadp import *  # noqa: F403
-from dataretrieval.nwis import *  # noqa: F403
-from dataretrieval.samples import *  # noqa: F403
-from dataretrieval.streamstats import *  # noqa: F403
-from dataretrieval.utils import *  # noqa: F403
-from dataretrieval.waterdata import *  # noqa: F403
-from dataretrieval.waterwatch import *  # noqa: F403
-from dataretrieval.wqp import *  # noqa: F403
+from dataretrieval.nadp import *
+from dataretrieval.nwis import *
+from dataretrieval.samples import *
+from dataretrieval.streamstats import *
+from dataretrieval.utils import *
+from dataretrieval.waterdata import *
+from dataretrieval.waterwatch import *
+from dataretrieval.wqp import *

dataretrieval/codes/__init__.py

@@ -1,2 +1,2 @@
-from .states import *  # noqa: F403
-from .timezones import *  # noqa: F403
+from .states import *
+from .timezones import *

dataretrieval/nldi.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from json import JSONDecodeError
 from typing import Literal, Optional, Union
 
@@ -246,12 +248,12 @@ def get_features(
                 " be provided with lat or long"
             )
 
+    if not lat and (comid or data_source) and navigation_mode is None:
+        raise ValueError(
+            "navigation_mode is required if comid or data_source is provided"
+        )
+
     if not lat:
-        if comid or data_source:
-            if navigation_mode is None:
-                raise ValueError(
-                    "navigation_mode is required if comid or data_source is provided"
-                )
         # validate the feature source and comid
         _validate_feature_source_comid(feature_source, feature_id, comid)
         # validate the data source

dataretrieval/nwis.py

@@ -4,6 +4,8 @@
 
 """
 
+from __future__ import annotations
+
 import re
 import warnings
 from io import StringIO
@@ -79,10 +81,9 @@ def format_response(
     if service == "peaks":
         df = preformat_peaks_response(df)
 
-    if gpd is not None:
-        if "dec_lat_va" in list(df):
-            geoms = gpd.points_from_xy(df.dec_long_va.values, df.dec_lat_va.values)
-            df = gpd.GeoDataFrame(df, geometry=geoms, crs=_CRS)
+    if gpd is not None and "dec_lat_va" in list(df):
+        geoms = gpd.points_from_xy(df.dec_long_va.values, df.dec_lat_va.values)
+        df = gpd.GeoDataFrame(df, geometry=geoms, crs=_CRS)
 
     # check for multiple sites:
     if "datetime" not in df.columns:

pyproject.toml

@@ -77,12 +77,6 @@ repository = "https://github.com/DOI-USGS/dataretrieval-python.git"
 [tool.setuptools_scm]
 write_to = "dataretrieval/_version.py"
 
-[tool.isort]
-profile = "black"
-
-[tool.black]
-skip-string-normalization = true
-
 [tool.ruff.format]
 quote-style = "double"
 docstring-code-format = true
@@ -99,4 +93,6 @@ extend-select = [
 
 [tool.ruff.lint.per-file-ignores]
 "demos/*.ipynb" = ["E501", "W291"]
+"dataretrieval/__init__.py" = ["F403"]
+"dataretrieval/codes/__init__.py" = ["F403"]