Replace shed with ruff

Based on issues in #581

Author: jeremyh

.pre-commit-config.yaml

@@ -1,28 +1,11 @@
 ---
 repos:
-  # Normalise all Python code. (Black + isort + pyupgrade + autoflake)
-  - repo: https://github.com/Zac-HD/shed
-    rev: 2024.3.1
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.3.5
     hooks:
-    - id: shed
-  # Python Linting
-  - repo: https://github.com/pycqa/flake8
-    rev: 7.0.0
-    hooks:
-      - id: flake8
-        exclude: ^docs/
-        additional_dependencies:
-          - flake8-bugbear # Lint-checks too opinionated for flake8 proper
-          - flake8-builtins # Don't allow built-in names like list
-          - flake8-coding # Only UTF-8
-          - flake8-debugger # Don't commit debugger calls
-          - flake8-executable # Check shebangs and executable permissions
-          - flake8-logging-format # Use log arguments, not string format
-          - flake8-pep3101 # Don't use old string % formatting
-          - flake8-pytest-style # Avoid common pytest mistakes
-          - flake8-pytest # Use plain assert, not unittest assertions
-          - flake8-rst-docstrings # docstring should be valid ReST
-          - pep8-naming # Follow pep8 naming rules (eg. function names lowercase)
+    - id: ruff
+      args: [--fix, --show-fixes, --output-format, grouped]
+    - id: ruff-format
   # Lint Python snippets embedded in Markdown (using flake8)
   - repo: https://github.com/johnfraney/flake8-markdown
     rev: v0.5.0
@@ -41,7 +24,7 @@ repos:
         args: ['-c', '.yamllint']
   # Common pre-commit checks
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files # We don't want huge files. (Cut down test data!)
         args: ['--maxkb=2000']

cubedash/_audit.py

@@ -8,7 +8,8 @@
 from datacube.model import Range
 from flask import Blueprint, Response, redirect, url_for
 
-from . import _model, _utils as utils
+from . import _model
+from . import _utils as utils
 
 _LOG = logging.getLogger(__name__)
 bp = Blueprint(

cubedash/_dataset.py

@@ -4,7 +4,8 @@
 import flask
 from flask import Blueprint, abort, url_for
 
-from . import _model, _utils as utils
+from . import _model
+from . import _utils as utils
 
 _LOG = logging.getLogger(__name__)
 bp = Blueprint(

cubedash/_filters.py

@@ -18,7 +18,8 @@
 from orjson import orjson
 from shapely.geometry import MultiPolygon
 
-from . import _model, _utils, _utils as utils
+from . import _model, _utils
+from . import _utils as utils
 
 # How far to step the number when the user hits up/down.
 NUMERIC_STEP_SIZE = {
@@ -173,9 +174,7 @@ def _format_albers_area(shape: MultiPolygon):
 @bp.app_template_filter("query_value")
 def _format_query_value(val):
     if isinstance(val, Range):
-        return "{} to {}".format(
-            _format_query_value(val.begin), _format_query_value(val.end)
-        )
+        return f"{_format_query_value(val.begin)} to {_format_query_value(val.end)}"
     if isinstance(val, datetime):
         return _format_datetime(val)
     if val is None:

cubedash/_pages.py

@@ -28,6 +28,8 @@
     _product,
     _stac,
     _stac_legacy,
+)
+from . import (
     _utils as utils,
 )
 from ._utils import as_rich_json, get_sorted_product_summaries
@@ -160,7 +162,7 @@ def legacy_search_page(
 @app.route("/products/<product_name>/datasets/<int:year>")
 @app.route("/products/<product_name>/datasets/<int:year>/<int:month>")
 @app.route("/products/<product_name>/datasets/<int:year>/<int:month>/<int:day>")
-def search_page(  # noqa: C901
+def search_page(
     product_name: str = None, year: int = None, month: int = None, day: int = None
 ):
     (
@@ -427,7 +429,9 @@ def timeline_page(product_name: str):
     return redirect(url_for("product_page", product_name=product_name))
 
 
-def _load_product(product_name, year, month, day) -> Tuple[
+def _load_product(
+    product_name, year, month, day
+) -> Tuple[
     DatasetType,
     ProductSummary,
     TimePeriodOverview,

cubedash/_product.py

@@ -3,7 +3,8 @@
 
 from flask import Blueprint, Response, abort, redirect, url_for
 
-from cubedash import _model, _utils, _utils as utils
+from cubedash import _model, _utils
+from cubedash import _utils as utils
 
 _LOG = logging.getLogger(__name__)
 bp = Blueprint("product", __name__)

cubedash/_stac.py

@@ -1,7 +1,8 @@
 import json
 import logging
 import uuid
-from datetime import datetime, time as dt_time, timedelta
+from datetime import datetime, timedelta
+from datetime import time as dt_time
 from functools import partial
 from typing import Callable, Dict, List, Optional, Sequence, Tuple, Union
 
@@ -10,7 +11,8 @@
 from datacube.model import Dataset, Range
 from datacube.utils import DocReader, parse_time
 from dateutil.tz import tz
-from eodatasets3 import serialise, stac as eo3stac
+from eodatasets3 import serialise
+from eodatasets3 import stac as eo3stac
 from eodatasets3.model import AccessoryDoc, DatasetDoc, MeasurementDoc, ProductDoc
 from eodatasets3.properties import Eo3Dict
 from eodatasets3.utils import is_doc_eo3
@@ -288,7 +290,7 @@ def field_path_row(key, value):
     elif key == "sat_row":
         kind = "landsat:wrs_row"
     else:
-        raise ValueError(f"Path/row kind {repr(key)}")
+        raise ValueError(f"Path/row kind {key!r}")
 
     # If there's only one value in the range, return it.
     if isinstance(value, Range):
@@ -623,7 +625,7 @@ def _handle_fields_extension(
                 keys=inc.split("."),
                 # get corresponding field from item
                 # disallow default to avoid None values being inserted
-                func=lambda _: _get_property(inc, item, no_default=True),  # noqa: B023
+                func=lambda _: _get_property(inc, item, no_default=True),
             )
 
         for exc in fields.get("exclude") or []:

cubedash/_utils.py

@@ -18,7 +18,7 @@
 import datacube.drivers.postgres._schema
 import eodatasets3.serialise
 import flask
-import numpy
+import numpy as np
 import shapely.geometry
 import shapely.validation
 import structlog
@@ -578,7 +578,7 @@ def as_yaml(*o, content_type="text/yaml", downloadable_filename_prefix: str = No
 
     # TODO: remove the two functions once eo-datasets fix is released
     def _represent_float(self, value):
-        text = numpy.format_float_scientific(value)
+        text = np.format_float_scientific(value)
         return self.represent_scalar("tag:yaml.org,2002:float", text)
 
     def dumps_yaml(yml, stream, *docs) -> None:

cubedash/generate.py

@@ -52,6 +52,7 @@
 
 
 """
+
 import collections
 import multiprocessing
 import re
@@ -64,7 +65,8 @@
 
 import click
 import structlog
-from click import secho as click_secho, style
+from click import secho as click_secho
+from click import style
 from datacube.config import LocalConfig
 from datacube.index import Index, index_connect
 from datacube.model import DatasetType
@@ -75,7 +77,7 @@
     GenerateResult,
     SummaryStore,
     TimePeriodOverview,
-    UnsupportedWKTProductCRS,
+    UnsupportedWKTProductCRSError,
 )
 from cubedash.summary._stores import DEFAULT_EPSG
 from cubedash.summary._summarise import DEFAULT_TIMEZONE
@@ -132,7 +134,7 @@ def print_status(product_name=None, year=None, month=None, day=None, summary=Non
             minimum_change_scan_window=settings.minimum_change_scan_window,
         )
         return product_name, result, updated_summary
-    except UnsupportedWKTProductCRS as e:
+    except UnsupportedWKTProductCRSError as e:
         log.warning("product.unsupported", reason=e.reason)
         return product_name, GenerateResult.UNSUPPORTED, None
     except Exception:
@@ -230,7 +232,7 @@ def _load_products(index: Index, product_names) -> List[DatasetType]:
                 p.name for p in index.products.get_all()
             )
             raise click.BadParameter(
-                f"Unknown product {repr(product_name)}.\n\n"
+                f"Unknown product {product_name!r}.\n\n"
                 f"Possibilities:\n\t{possible_product_names}",
                 param_hint="product_names",
             )

cubedash/gunicorn_config.py

@@ -1,5 +1,4 @@
-"""Gunicorn config for Prometheus internal metrics
-"""
+"""Gunicorn config for Prometheus internal metrics"""
 
 import os