Merge pull request #552 from MiraGeoscience/GEOPY-939-precommit

GEOPY-939 pre-commit autoupdate to fix isort problem

Author: sebhmg

.pre-commit-config.yaml

@@ -12,15 +12,15 @@ ci:
 
 repos:
 -   repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 23.3.0
     hooks:
     -   id: black
 -   repo: https://github.com/asottile/seed-isort-config
     rev: v2.2.0
     hooks:
         -   id: seed-isort-config
 -   repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
     -   id: isort
         additional_dependencies: [toml] # to read config from pyproject.toml
@@ -33,7 +33,7 @@ repos:
 #    hooks:
 #    -   id: flake8
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.2
+    rev: v3.3.2
     hooks:
     -   id: pyupgrade
         args: [--py39-plus]
@@ -59,13 +59,13 @@ repos:
         types: [python]
         exclude: (^setup.py$|(docs|assets)/)
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.1.0
+    rev: v2.2.4
     hooks:
     -   id: codespell
-        exclude: (\.ipynb$)
+        exclude: (-lock\.ya?ml|\benvironments/.*\.ya?ml|\.ipynb)$
         entry: codespell -I .codespellignore
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
     -   id: trailing-whitespace
         exclude: \.mdj$
@@ -81,11 +81,11 @@ repos:
     -   id: mixed-line-ending
     -   id: name-tests-test
 -   repo: https://github.com/rstcheck/rstcheck
-    rev: v6.0.0.post1
+    rev: v6.1.2
     hooks:
     -   id: rstcheck
         additional_dependencies: [sphinx]
 -   repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.9.0
+    rev: v1.10.0
     hooks:
     -   id: rst-backticks

geoapps/base/application.py

@@ -119,7 +119,6 @@ def __populate__(self, **kwargs):
             if key[0] == "_":
                 key = key[1:]
             if hasattr(self, "_" + key) or hasattr(self, key):
-
                 if isinstance(value, list):
                     value = [dict_mapper(val, mappers) for val in value]
                 else:
@@ -206,7 +205,6 @@ def live_link_choice(self, _):
         Enable the monitoring folder
         """
         if self.live_link.value:
-
             if (self.h5file is not None) and (self.monitoring_directory is None):
                 live_path = path.join(path.abspath(path.dirname(self.h5file)), "Temp")
                 self.monitoring_directory = live_path
@@ -240,7 +238,6 @@ def monitoring_directory(self):
 
     @monitoring_directory.setter
     def monitoring_directory(self, live_path: str):
-
         if not path.exists(live_path):
             mkdir(live_path)
 
@@ -333,7 +330,6 @@ def h5file(self):
         :obj:`str`: Target geoh5 project file.
         """
         if getattr(self, "_h5file", None) is None:
-
             if self._workspace is not None:
                 self.h5file = self._workspace.h5file
 

geoapps/base/plot.py

@@ -47,7 +47,6 @@ class PlotSelection2D(ObjectDataSelection):
     plot_result = True
 
     def __init__(self, **kwargs):
-
         self.defaults.update(**app_initializer)
         self.defaults.update(**kwargs)
         self.axis = None

geoapps/base/selection.py

@@ -366,7 +366,6 @@ class LineOptions(ObjectDataSelection):
     _defaults = {"find_label": "line"}
 
     def __init__(self, **kwargs):
-
         self._multiple_lines = None
         self._add_xyz = False
         self._lines = None

geoapps/clustering/application.py

@@ -880,7 +880,6 @@ def make_scatter_plot(
             crossplot = go.Figure(self.scatter_driver.run())
             return crossplot
         else:
-
             return go.Figure()
 
     @staticmethod

geoapps/clustering/driver.py

@@ -30,7 +30,6 @@
 
 
 class ClusteringDriver(BaseDriver):
-
     _params_class = ClusteringParams
     _validations = validations
 

geoapps/contours/driver.py

@@ -27,7 +27,6 @@
 
 
 class ContoursDriver(BaseDriver):
-
     _params_class = ContoursParams
     _validations = validations
 

geoapps/coordinate_transformation/application.py

@@ -94,7 +94,6 @@ def trigger_click(self, _):
         import matplotlib.pyplot as plt
 
         if self.wkt_in.value != "" and self.wkt_out.value != "":
-
             if self.plot_result:
                 self._figure = plt.figure(figsize=(12, 8))
                 ax1 = plt.subplot(1, 2, 1)
@@ -110,7 +109,6 @@ def trigger_click(self, _):
                 )
 
                 for uid in self.objects.value:
-
                     obj = self.workspace.get_entity(uid)[0]
 
                     if isinstance(obj, Grid2D):
@@ -123,7 +121,6 @@ def trigger_click(self, _):
                             temp_file_out = child.name + ".tif"
 
                             if isinstance(child, FloatData):
-
                                 export_grid_2_geotiff(
                                     child,
                                     temp_file,

geoapps/driver_base/driver.py

@@ -17,7 +17,6 @@
 
 
 class BaseDriver(ABC):
-
     _params_class = BaseParams
     _validations = None
 

geoapps/driver_base/params.py

@@ -356,7 +356,6 @@ def _uuid_promoter(self, uid):
         return uid
 
     def setter_validator(self, key: str, value, fun=lambda x: x):
-
         if value is None:
             setattr(self, f"_{key}", value)
             return

geoapps/driver_base/utils.py

@@ -55,7 +55,6 @@ def running_mean(
 
 
 def treemesh_2_octree(workspace, treemesh, **kwargs):
-
     index_array, levels = getattr(treemesh, "_ubc_indArr")
     ubc_order = getattr(treemesh, "_ubc_order")
 

geoapps/edge_detection/driver.py

@@ -28,7 +28,6 @@
 
 
 class EdgeDetectionDriver(BaseDriver):
-
     _params_class = EdgeDetectionParams
     _validations = validations
 
@@ -158,7 +157,6 @@ def get_edges(
             coords = []
             for cx in cnt_x:
                 for cy in cnt_y:
-
                     i_min, i_max = int(cy - half_y), int(cy + half_y)
                     j_min, j_max = int(cx - half_x), int(cx + half_x)
                     lines = probabilistic_hough_line(

geoapps/export/application.py

@@ -184,7 +184,6 @@ def _collect_data_values(self):
 
         data_values = {}
         if self.data.value:
-
             for key in self.data.value:
                 if self.workspace.get_entity(key):
                     data_values[key] = self.workspace.get_entity(key)[0].values.copy()
@@ -236,7 +235,6 @@ def _export_shapefile(self, entity):
             print(f"Object saved to {filename}")
 
     def _export_geotiff(self, entity):
-
         for key in self.data.value:
             name = (
                 path.join(self.export_directory.selected_path, self.export_as.value)
@@ -306,7 +304,6 @@ def _export_ubc(self, entity, data_values):
             print(f"Models saved to {list(models)}")
 
         else:
-
             mesh = discretize.TensorMesh(
                 [
                     np.abs(entity.u_cells),
@@ -330,7 +327,6 @@ def _export_ubc(self, entity, data_values):
 
             if any(data_values):
                 for key, item in data_values.items():
-
                     if mesh.x0[2] == entity.origin["z"]:
                         values = item.copy()
                         values = values.reshape(

geoapps/export/utils.py

@@ -54,7 +54,6 @@ def object_2_dataframe(entity, fields=None, inplace=False, vertices=True, index=
 def parse_lines(curve, values):
     polylines, polyvalues = [], []
     for line_id in curve.unique_parts:
-
         ind_line = np.where(curve.parts == line_id)[0]
         polylines += [curve.vertices[ind_line, :2]]
 
@@ -102,10 +101,8 @@ def export_curve_2_shapefile(
         schema=schema,
         crs_wkt=wkt_code,
     ) as shapefile:
-
         # If there are multiple geometries, put the "for" loop here
         for i, poly in enumerate(polylines):
-
             if len(poly) > 1:
                 poly = LineString(list(tuple(map(tuple, poly))))
 

geoapps/interpolation/driver.py

@@ -23,7 +23,6 @@
 
 
 class DataInterpolationDriver(BaseDriver):
-
     _params_class = DataInterpolationParams
     _validations = validations
 
@@ -64,7 +63,6 @@ def run(self):
         values_interp = {}
         rad, ind = tree.query(xyz_out)
         if self.params.method == "Nearest":
-
             print("Computing nearest neighbor interpolation")
             # Find nearest cells
             for key, value in values.items():

geoapps/inversion/airborne_electromagnetics/application.py

@@ -56,7 +56,6 @@ class ChannelOptions:
     """
 
     def __init__(self, key, description, **kwargs):
-
         self._active = Checkbox(
             value=False,
             indent=True,
@@ -161,7 +160,6 @@ def offset(self):
 
     @property
     def options(self):
-
         if getattr(self, "_options", None) is None:
             self._options = widgets.RadioButtons(
                 options=[
@@ -361,7 +359,6 @@ def __init__(self, **kwargs):
         )
 
     def update_panel(self, _):
-
         if self._options.value == "Model":
             self._main.children[1].children = [self._options, self.selection_widget]
             self._main.children[1].children[1].layout.visibility = "visible"
@@ -658,7 +655,6 @@ def plot_convergence_curve(h5file):
     )
 
     def plot_curve(objects):
-
         inversion = workspace.get_entity(objects)[0]
         result = None
         if getattr(inversion, "comments", None) is not None:
@@ -724,7 +720,6 @@ def inversion_defaults():
 
 
 class InversionApp(PlotSelection2D):
-
     _select_multiple = False
     _add_groups = "only"
     _sensor = None
@@ -901,7 +896,6 @@ def system(self):
     @property
     def topography(self):
         if getattr(self, "_topography", None) is None:
-
             self._topography = TopographyOptions(
                 workspace=self._workspace, **self.defaults["topography"]
             )
@@ -1001,7 +995,6 @@ def system_observer(self, _):
         )
 
         def channel_setter(caller):
-
             channel = caller["owner"]
             data_widget = self.data_channel_choices.data_channel_options[channel.header]
 
@@ -1098,7 +1091,6 @@ def channel_setter(caller):
         self.trigger.button_style = "danger"
 
     def object_observer(self, _):
-
         self.resolution.indices = None
         entity = self._workspace.get_entity(self.objects.value)[0]
         if entity is None:
@@ -1135,7 +1127,6 @@ def object_observer(self, _):
         self.trigger.button_style = "danger"
 
     def update_component_panel(self, _):
-
         obj, data_list = self.get_selected_entities()
 
         if obj is None:
@@ -1369,7 +1360,6 @@ def write_trigger(self, _):
                 self.ga_group_name.value + ".geoh5",
             )
         ) as new_workspace:
-
             obj, _ = self.get_selected_entities()
             new_obj = obj.copy(parent=new_workspace, copy_children=False)
 
@@ -1387,7 +1377,6 @@ def write_trigger(self, _):
                 input_dict["data"]["channels"] = str(new_group.uid)
 
             if self._uncertainties.value is not None:
-
                 prop_group = obj.find_or_create_property_group(
                     name=self.data.uid_name_map[self._uncertainties.value]
                 )
@@ -1423,7 +1412,6 @@ def write_trigger(self, _):
                 obj, data = elem.get_selected_entities()
 
                 if obj is not None:
-
                     new_obj = new_workspace.get_entity(obj.uid)[0]
                     if new_obj is None:
                         new_obj = obj.copy(parent=new_workspace, copy_children=False)