chore: Update pre-commit (#771)

holoviz · Nov 28, 2024 · 2bfbeea · 2bfbeea
1 parent fb6fd20
commit 2bfbeea
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 21 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -17,7 +17,7 @@ repos:
       - id: check-json
       - id: detect-private-key
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.9
+    rev: v0.8.0
     hooks:
       - id: ruff
         files: geoviews/

diff --git a/geoviews/__init__.py b/geoviews/__init__.py
@@ -56,6 +56,8 @@
 from .util import from_xarray
 
 __all__ = (
+    "RGB",
+    "WMTS",
     "Contours",
     "Cycle",
     "Dataset",
@@ -84,7 +86,6 @@
     "Points",
     "Polygons",
     "QuadMesh",
-    "RGB",
     "Rectangles",
     "Segments",
     "Shape",
@@ -93,26 +94,24 @@
     "Tiles",
     "TriMesh",
     "VectorField",
-    "WMTS",
     "WindBarbs",
     "__version__",
+    "annotate", # Lazy modules
     "data",
     "dim",
     "extension",
     "feature",
     "from_xarray",
     "help",
+    "operation", # Lazy modules
     "opts",
     "output",
     "plotting",
+    "project", # Lazy modules
     "render",
     "renderer",
     "save",
     "tile_sources",
-    # Lazy modules
-    "annotate",
-    "project",
-    "operation",
 )
 
 # Ensure opts utility is initialized with GeoViews elements

diff --git a/geoviews/_warnings.py b/geoviews/_warnings.py
@@ -7,10 +7,10 @@
 from packaging.version import Version
 
 __all__ = (
-    "deprecated",
-    "find_stack_level",
     "GeoviewsDeprecationWarning",
     "GeoviewsUserWarning",
+    "deprecated",
+    "find_stack_level",
     "warn",
 )
 

diff --git a/geoviews/data/__init__.py b/geoviews/data/__init__.py
@@ -2,4 +2,4 @@
 from .geopandas import GeoPandasInterface
 from .iris import CubeInterface
 
-__all__ = ("GeomDictInterface", "GeoPandasInterface", "CubeInterface")
+__all__ = ("CubeInterface", "GeoPandasInterface", "GeomDictInterface")
diff --git a/geoviews/data/geom_dict.py b/geoviews/data/geom_dict.py
@@ -99,11 +99,10 @@ def validate(cls, dataset, validate_vdims):
         from shapely.geometry.base import BaseGeometry
         geom_dims = cls.geom_dims(dataset)
         if len(geom_dims) != 2:
-            raise DataError('Expected %s instance to declare two key '
+            raise DataError(f'Expected {type(dataset).__name__} instance to declare two key '
                             'dimensions corresponding to the geometry '
-                            'coordinates but %d dimensions were found '
-                            'which did not refer to any columns.'
-                            % (type(dataset).__name__, len(geom_dims)), cls)
+                            f'coordinates but {len(geom_dims)} dimensions were found '
+                            'which did not refer to any columns.', cls)
         elif 'geometry' not in dataset.data:
             raise DataError("Could not find a 'geometry' column in the data.")
         elif not isinstance(dataset.data['geometry'], BaseGeometry):

diff --git a/geoviews/data/geopandas.py b/geoviews/data/geopandas.py
@@ -108,11 +108,10 @@ def validate(cls, dataset, vdims=True):
         dim_types = 'key' if vdims else 'all'
         geom_dims = cls.geom_dims(dataset)
         if len(geom_dims) > 0 and len(geom_dims) != 2:
-            raise DataError('Expected %s instance to declare two key '
+            raise DataError(f'Expected {type(dataset).__name__} instance to declare two key '
                             'dimensions corresponding to the geometry '
-                            'coordinates but %d dimensions were found '
-                            'which did not refer to any columns.'
-                            % (type(dataset).__name__, len(geom_dims)), cls)
+                            f'coordinates but {len(geom_dims)} dimensions were found '
+                            'which did not refer to any columns.', cls)
         not_found = [d.name for d in dataset.dimensions(dim_types)
                      if d not in geom_dims and d.name not in dataset.data]
         if not_found:

diff --git a/geoviews/element/__init__.py b/geoviews/element/__init__.py
@@ -37,6 +37,8 @@
 )
 
 __all__ = (
+    "RGB",
+    "WMTS",
     "Contours",
     "Dataset",
     "EdgePaths",
@@ -54,15 +56,13 @@
     "Points",
     "Polygons",
     "QuadMesh",
-    "RGB",
     "Rectangles",
     "Segments",
     "Shape",
     "Text",
     "Tiles",
     "TriMesh",
     "VectorField",
-    "WMTS",
     "WindBarbs",
     "is_geographic",
 )

diff --git a/geoviews/operation/regrid.py b/geoviews/operation/regrid.py
@@ -135,5 +135,5 @@ def clean_weight_files(cls):
                 deleted.append(f)
             except FileNotFoundError:
                 pass
-        print('Deleted %d weight files' % len(deleted))
+        print(f'Deleted {len(deleted)} weight files')
         cls._files = []