Merge pull request #64 from data-exp-lab/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

Author: chrishavlin

.pre-commit-config.yaml

@@ -6,16 +6,16 @@ ci:
     autoupdate_schedule: weekly
 
 repos:
--   repo: https://github.com/ambv/black
-    rev: 22.8.0
+-   repo: https://github.com/psf/black
+    rev: 23.9.1
     hooks:
     - id: black
       language_version: python3
--   repo: https://github.com/timothycrosley/isort
+-   repo: https://github.com/PyCQA/isort
     rev: '5.12.0'
     hooks:
     -   id: isort
 -   repo: https://github.com/PyCQA/flake8
-    rev: '6.0.0'
+    rev: '6.1.0'
     hooks:
     -   id: flake8

yt_xarray/accessor/_readers.py

@@ -8,7 +8,6 @@
 def _get_xarray_reader(
     handle, sel_info: _xr_to_yt.Selection, interp_required: Optional[bool] = True
 ):
-
     # the callable generator for an open xarray handle.
     # handle: an open xarray handle
     # sel_info: a Selection object for the handle

yt_xarray/accessor/_xr_to_yt.py

@@ -32,7 +32,6 @@ def __init__(
         sel_dict: Optional[dict] = None,
         sel_dict_type: Optional[str] = "isel",
     ):
-
         self.fields = self._validate_fields(xr_ds, fields)
         self.units: dict = self._find_units(xr_ds)
         self.full_shape = xr_ds.data_vars[self.fields[0]].shape
@@ -60,7 +59,6 @@ def __init__(
         self.yt_coord_names = _convert_to_yt_internal_coords(self.selected_coords)
 
     def _find_units(self, xr_ds) -> dict:
-
         units = {}
         for field in self.fields:
             unit = getattr(xr_ds[field], "units", "")
@@ -70,7 +68,6 @@ def _find_units(self, xr_ds) -> dict:
         return units
 
     def _find_starting_index(self, coordname, coord_da, coord_select) -> int:
-
         si = 0
         selector = coord_select[coordname]
         if self.sel_dict_type == "isel":
@@ -116,7 +113,6 @@ def _find_starting_index(self, coordname, coord_da, coord_select) -> int:
         return si
 
     def _process_selection(self, xr_ds):
-
         # the full list of coordinates (in order)
         full_coords = list(xr_ds.data_vars[self.fields[0]].dims)
         time = 0.0
@@ -162,7 +158,6 @@ def _process_selection(self, xr_ds):
             is_time_dim = _check_for_time(c, coord_vals)
 
             if coord_vals.size > 1:
-
                 # not positive-monotonic? reverse it for cell width calculations
                 # changes to indexing are accounted for when extracting data.
                 if reverse_axis[-1]:
@@ -220,7 +215,6 @@ def _process_selection(self, xr_ds):
         }
 
     def _validate_fields(self, xr_ds, fields: List[str]) -> List[str]:
-
         if fields is None:
             raise ValueError("Please provide a list of fields")
 
@@ -232,7 +226,6 @@ def _validate_fields(self, xr_ds, fields: List[str]) -> List[str]:
             msg = "Provided fields must have the same "
 
             for f in fields[1:]:
-
                 if xr_ds.data_vars[f].shape != shape:
                     rmsg = msg + f"shape : {f} does not match {fields[0]}"
                     raise RuntimeError(rmsg)
@@ -400,7 +393,6 @@ def _add_3rd_axis_name(yt_geometry: str, axis_order: list) -> list:
 
 
 def _size_of_array_like(v):
-
     if isinstance(v, (np.ndarray, xr.DataArray)):
         return v.size
 

yt_xarray/accessor/accessor.py

@@ -220,7 +220,6 @@ def get_bbox(
 def _load_single_grid(
     ds_xr, sel_info, geom, use_callable, fields, length_unit, **kwargs
 ):
-
     geometry = geom[0]
 
     interp_required, data_shp, bbox = sel_info.interp_validation(geometry)
@@ -285,7 +284,6 @@ def _load_single_grid(
 def _load_chunked_grid(
     ds_xr, sel_info, geom, use_callable, fields, length_unit, chunksizes, **kwargs
 ):
-
     if isinstance(chunksizes, int):
         chunksizes = np.array((chunksizes,) * sel_info.ndims)
     elif len(chunksizes) != sel_info.ndims:
@@ -339,7 +337,6 @@ def _load_chunked_grid(
     subgrid_start = []
     subgrid_end = []
     for idim in range(sel_info.ndims):
-
         si_0 = si[idim] + chunksizes[idim] * np.arange(n_whl_chnk[idim])
         ei_0 = si_0 + chunksizes[idim]
 

yt_xarray/sample_data.py

@@ -34,7 +34,6 @@ def load_random_xr_data(
 
     data = {}
     for field, field_dims in fields.items():
-
         coords = {}
         sz = []
         for dim_name in field_dims:

yt_xarray/tests/test_accesor.py

@@ -31,7 +31,6 @@ def ds_xr():
 
 
 def test_accessor():
-
     tfield = "a_new_field"
     n_x = 3
     n_y = 4
@@ -82,7 +81,6 @@ def test_bbox():
 
 @pytest.mark.parametrize("use_callable", (True, False))
 def test_load_grid(ds_xr, use_callable):
-
     flds = ["a_new_field_0", "a_new_field_1"]
     ds_yt = ds_xr.yt.load_grid(flds, use_callable=use_callable)
     assert ds_yt.coordinates.name == "internal_geographic"

yt_xarray/tests/test_chunking.py

@@ -10,7 +10,6 @@
 
 
 def test_partial_chunks_uni_cartesian():
-
     # uniform grid, cartesian
     fields = {
         "field0": ("x", "y", "z"),
@@ -29,7 +28,6 @@ def test_partial_chunks_uni_cartesian():
 
 
 def test_cartesian():
-
     # builds yt grids with and without chunking (and callables), compares the
     # frb ImageArrays for equivalent SlicePlots
     ds = construct_minimal_ds(x_name="x", y_name="y", z_name="z", n_fields=2)
@@ -49,7 +47,6 @@ def test_cartesian():
 
 
 def test_geographic_interp():
-
     # this case will require interpolation
     ds = construct_minimal_ds(n_fields=2)
     ds_yt_nochunk = ds.yt.load_grid()
@@ -66,7 +63,6 @@ def test_geographic_interp():
 
 
 def test_geographic_no_interp():
-
     # this case will not require interpolation
     ds = construct_minimal_ds(
         n_fields=2, min_x=30.0, max_x=35.0, min_y=40.0, max_y=42.0
@@ -106,7 +102,6 @@ def test_chunks_stretched_not_implemented():
 
 
 def test_dask_array():
-
     # checks that we can handle a field that is a dask array
     shp = (10, 12, 5)
     f1 = da.random.random(shp, chunks=5)

yt_xarray/tests/test_sample_data.py

@@ -5,7 +5,6 @@
 
 
 def test_load_random_xr_data():
-
     fields = {
         "field0": ("x", "y"),
         "field1": ("x", "y", "z"),
@@ -23,7 +22,6 @@ def test_load_random_xr_data():
 
 
 def test_load_random_xr_data_bad():
-
     fields = {"field0": ("x", "y")}
     dims = {"x": (0, 1, 4)}
 

yt_xarray/tests/test_utilities.py

@@ -40,7 +40,6 @@ def test_float32_ds():
 
 
 def test_file_validation(tmp_path):
-
     tdir = tmp_path / "test_data"
     tdir.mkdir()
     b = tdir / "test_file.txt"

yt_xarray/tests/test_xr_to_yt.py

@@ -35,9 +35,7 @@ def ds_xr():
 
 @pytest.mark.parametrize("coord", ("latitude", "longitude", "altitude"))
 def test_selection_aliases(coord):
-
     for othername in xr2yt._coord_aliases[coord]:
-
         kwargs = {c_m_ds_kwargs[coord]: othername}
         ds = construct_minimal_ds(**kwargs)
         fields = list(ds.data_vars)
@@ -74,7 +72,6 @@ def _isel_tester(ds_xr, sel, fields, coord, start_index):
 
 @pytest.mark.parametrize("coord", ("latitude", "longitude", "depth"))
 def test_selection_isel(ds_xr, coord):
-
     fields = list(ds_xr.data_vars)
 
     sel_dict = {coord: slice(1, len(ds_xr.coords[coord]))}
@@ -129,7 +126,6 @@ def test_selection_units():
 
 
 def test_selection_errors(ds_xr):
-
     coord = "latitude"
     sel_dict = {coord: slice(1, len(ds_xr.coords[coord]))}
     sel_dict_type = "isel"
@@ -352,7 +348,6 @@ def test_two_dimensional(use_callable):
     "geometry", ["cartesian", "spherical", "geographic", "internal_geographic"]
 )
 def test_finding_3rd_dim(geometry):
-
     expected = _expected_geoms[geometry]
     # select any 2, make sure we add the 3rd back. repeat for every permutation
     choices = list(expected)
@@ -432,7 +427,6 @@ def test_time_check(dim_name, dim_vals, expected):
     ],
 )
 def test_selection_interp_validation(geometry, stretched, interp_required):
-
     if geometry == "cartesian":
         dim_names = ("x", "y", "z")
     elif geometry == "geographic":
@@ -467,7 +461,6 @@ def test_selection_interp_validation(geometry, stretched, interp_required):
     "yt_geom", ("cartesian", "spherical", "geographic", "internal_geographic")
 )
 def test_add_3rd_axis_name(yt_geom):
-
     # get full list, remove on and make sure we get it back
     expected = list(xr2yt._expected_yt_axes[yt_geom])
     actual = xr2yt._add_3rd_axis_name(yt_geom, expected[:-1])