Ruff fixes by bot

Author: nodohs

.github/workflows/python-package.yml

@@ -10,7 +10,28 @@ on:
     branches: ['main']
 
 jobs:
+  ruff:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
+      - name: Set up Python 3.13
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
+        with:
+          python-version: '3.13'
+      - name: Install Ruff
+        run: |
+          python -m pip install --upgrade pip
+          pip install ruff
+      - name: Ruff check
+        run: |
+          ruff check .
+      - name: Ruff format check
+        run: |
+          ruff format --check .
+
   build:
+    needs: ruff
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -28,12 +49,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install .[test,nldi]
-      - name: Lint with flake8
-        run: |
-          # stop the build if there are Python syntax errors or undefined names
-          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
       - name: Test with pytest and report coverage
         run: |
           coverage run -m pytest tests/

dataretrieval/__init__.py

@@ -5,11 +5,11 @@
 except PackageNotFoundError:
     __version__ = "version-unknown"
 
-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 *
+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

dataretrieval/codes/__init__.py

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

dataretrieval/nldi.py

@@ -5,8 +5,8 @@
 
 try:
     import geopandas as gpd
-except ImportError:
-    raise ImportError("Install geopandas to use the NLDI module.")
+except ImportError as err:
+    raise ImportError("Install geopandas to use the NLDI module.") from err
 
 NLDI_API_BASE_URL = "https://api.water.usgs.gov/nldi/linked-data"
 _AVAILABLE_DATA_SOURCES = None

dataretrieval/nwis.py

@@ -696,7 +696,8 @@ def get_info(ssl_check: bool = True, **kwargs) -> Tuple[pd.DataFrame, BaseMetada
                 "refer to https://waterdata.usgs.gov.nwis/qwdata and "
                 "https://doi-usgs.github.io/dataRetrieval/articles/Status.html "
                 "or email CompTools@usgs.gov."
-            )
+            ),
+            stacklevel=2,
         )
         # convert bool to string if necessary
         kwargs["seriesCatalogOutput"] = "True"

dataretrieval/samples.py

@@ -213,7 +213,10 @@ def get_usgs_samples(
     """
 
     warnings.warn(
-        "`get_usgs_samples` is deprecated and will be removed. Use `waterdata.get_samples` instead.",
+        (
+            "`get_usgs_samples` is deprecated and will be removed. "
+            "Use `waterdata.get_samples` instead."
+        ),
         DeprecationWarning,
         stacklevel=2,
     )

dataretrieval/streamstats.py

@@ -158,4 +158,4 @@ def from_streamstats_json(cls, streamstats_json):
 
     def __init__(self, rcode, xlocation, ylocation):
         """Init method that calls the :obj:`from_streamstats_json` method."""
-        self = get_watershed(rcode, xlocation, ylocation)
+        get_watershed(rcode, xlocation, ylocation)

dataretrieval/utils.py

@@ -39,16 +39,16 @@ def to_str(listlike, delimiter=","):
         '0+10+42'
 
     """
-    if type(listlike) == list:
+    if isinstance(listlike, list):
         return delimiter.join([str(x) for x in listlike])
 
-    elif type(listlike) == pd.core.series.Series:
+    elif isinstance(listlike, pd.core.series.Series):
         return delimiter.join(listlike.tolist())
 
-    elif type(listlike) == pd.core.indexes.base.Index:
+    elif isinstance(listlike, pd.core.indexes.base.Index):
         return delimiter.join(listlike.tolist())
 
-    elif type(listlike) == str:
+    elif isinstance(listlike, str):
         return listlike
 
 
@@ -91,6 +91,7 @@ def format_datetime(df, date_field, time_field, tz_field):
             f"Warning: {count} incomplete dates found, "
             + "consider setting datetime_index to False.",
             UserWarning,
+            stacklevel=2,
         )
 
     return df