Enforce ruff/flake8-simplify rules (SIM) (#10480)

* Apply ruff/flake8-simplify rule SIM102

SIM102 Use a single `if` statement instead of nested `if` statements

* Apply ruff/flake8-simplify rule SIM113

SIM113 Use `enumerate()` for index variable in `for` loop

* Apply ruff/flake8-simplify rule SIM114

SIM114 Combine `if` branches using logical `or` operator

* Apply ruff/flake8-simplify rule SIM201

SIM201 Use `... != ...` instead of `not ... == ..."`

* Apply ruff/flake8-simplify rule SIM905

SIM905 Consider using a list literal instead of `str.split`

* Apply ruff/flake8-simplify rule SIM910

SIM910 Use `.get(...)` instead of `.get(..., None)`

* Enforce ruff/flake8-simplify rules (SIM)

* Move comment near the related code

Co-authored-by: Illviljan <14371165+Illviljan@users.noreply.github.com>

* Ignore SIM102 as well

SIM102 Use a single `if` statement instead of nested `if` statements

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: Illviljan <14371165+Illviljan@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: 3 people

pyproject.toml

@@ -262,6 +262,7 @@ extend-select = [
   "PIE",  # flake8-pie
   "TID",  # flake8-tidy-imports (absolute imports)
   "PYI",  # flake8-pyi
+  "SIM",  # flake8-simplify
   "FLY",  # flynt
   "I",    # isort
   "PERF", # Perflint
@@ -283,6 +284,11 @@ ignore = [
   "PIE790",  # unnecessary pass statement
   "PYI019",  # use `Self` instead of custom TypeVar
   "PYI041",  # use `float` instead of `int | float`
+  "SIM102",  # use a single `if` statement instead of nested `if` statements
+  "SIM108",  # use ternary operator instead of `if`-`else`-block
+  "SIM117",  # use a single `with` statement instead of nested `with` statements
+  "SIM118",  # use `key in dict` instead of `key in dict.keys()`
+  "SIM300",  # yoda condition detected
   "PERF203", # try-except within a loop incurs performance overhead
   "E402",    # module level import not at top of file
   "E731",    # do not assign a lambda expression, use a def

xarray/core/formatting.py

@@ -989,9 +989,10 @@ def diff_array_repr(a, b, compat):
         ):
             summary.append(coords_diff)
 
-    if compat == "identical":
-        if attrs_diff := diff_attrs_repr(a.attrs, b.attrs, compat):
-            summary.append(attrs_diff)
+    if compat == "identical" and (
+        attrs_diff := diff_attrs_repr(a.attrs, b.attrs, compat)
+    ):
+        summary.append(attrs_diff)
 
     return "\n".join(summary)
 
@@ -1029,9 +1030,10 @@ def diff_dataset_repr(a, b, compat):
     ):
         summary.append(data_diff)
 
-    if compat == "identical":
-        if attrs_diff := diff_attrs_repr(a.attrs, b.attrs, compat):
-            summary.append(attrs_diff)
+    if compat == "identical" and (
+        attrs_diff := diff_attrs_repr(a.attrs, b.attrs, compat)
+    ):
+        summary.append(attrs_diff)
 
     return "\n".join(summary)
 

xarray/core/indexes.py

@@ -1247,7 +1247,7 @@ def create_variables(
                 level = name
                 dtype = self.level_coords_dtype[name]  # type: ignore[index]  # TODO: are Hashables ok?
 
-            var = variables.get(name, None)
+            var = variables.get(name)
             if var is not None:
                 attrs = var.attrs
                 encoding = var.encoding

xarray/core/resample_cftime.py

@@ -84,22 +84,16 @@ def __init__(
         self.freq = to_offset(freq)
         self.origin = origin
 
-        if isinstance(self.freq, MonthEnd | QuarterEnd | YearEnd):
-            if closed is None:
-                self.closed = "right"
-            else:
-                self.closed = closed
-            if label is None:
-                self.label = "right"
-            else:
-                self.label = label
-        # The backward resample sets ``closed`` to ``'right'`` by default
-        # since the last value should be considered as the edge point for
-        # the last bin. When origin in "end" or "end_day", the value for a
-        # specific ``cftime.datetime`` index stands for the resample result
-        # from the current ``cftime.datetime`` minus ``freq`` to the current
-        # ``cftime.datetime`` with a right close.
-        elif self.origin in ["end", "end_day"]:
+        if isinstance(self.freq, MonthEnd | QuarterEnd | YearEnd) or self.origin in [
+            "end",
+            "end_day",
+        ]:
+            # The backward resample sets ``closed`` to ``'right'`` by default
+            # since the last value should be considered as the edge point for
+            # the last bin. When origin in "end" or "end_day", the value for a
+            # specific ``cftime.datetime`` index stands for the resample result
+            # from the current ``cftime.datetime`` minus ``freq`` to the current
+            # ``cftime.datetime`` with a right close.
             if closed is None:
                 self.closed = "right"
             else:

xarray/groupers.py

@@ -701,25 +701,23 @@ def find_independent_seasons(seasons: Sequence[str]) -> Sequence[SeasonsGroup]:
     grouped = defaultdict(list)
     codes = defaultdict(list)
     seen: set[tuple[int, ...]] = set()
-    idx = 0
     # This is quadratic, but the number of seasons is at most 12
     for i, current in enumerate(season_inds):
         # Start with a group
         if current not in seen:
-            grouped[idx].append(current)
-            codes[idx].append(i)
+            grouped[i].append(current)
+            codes[i].append(i)
             seen.add(current)
 
         # Loop through remaining groups, and look for overlaps
         for j, second in enumerate(season_inds[i:]):
-            if not (set(chain(*grouped[idx])) & set(second)) and second not in seen:
-                grouped[idx].append(second)
-                codes[idx].append(j + i)
+            if not (set(chain(*grouped[i])) & set(second)) and second not in seen:
+                grouped[i].append(second)
+                codes[i].append(j + i)
                 seen.add(second)
         if len(seen) == len(seasons):
             break
-        # found all non-overlapping groups for this row, increment and start over
-        idx += 1
+        # found all non-overlapping groups for this row start over
 
     grouped_ints = tuple(tuple(idx) for idx in grouped.values() if idx)
     return [

xarray/plot/facetgrid.py

@@ -549,7 +549,7 @@ def map_plot1d(
         )
 
         if add_legend:
-            use_legend_elements = not func.__name__ == "hist"
+            use_legend_elements = func.__name__ != "hist"
             if use_legend_elements:
                 self.add_legend(
                     use_legend_elements=use_legend_elements,

xarray/plot/utils.py

@@ -419,9 +419,10 @@ def _infer_xy_labels(
         _assert_valid_xy(darray, x, "x")
         _assert_valid_xy(darray, y, "y")
 
-        if darray._indexes.get(x, 1) is darray._indexes.get(y, 2):
-            if isinstance(darray._indexes[x], PandasMultiIndex):
-                raise ValueError("x and y cannot be levels of the same MultiIndex")
+        if darray._indexes.get(x, 1) is darray._indexes.get(y, 2) and isinstance(
+            darray._indexes[x], PandasMultiIndex
+        ):
+            raise ValueError("x and y cannot be levels of the same MultiIndex")
 
     return x, y
 

xarray/structure/merge.py

@@ -300,7 +300,7 @@ def merge_collected(
                 variables = [variable for variable, _ in elements_list]
                 try:
                     merged_vars[name] = unique_variable(
-                        name, variables, compat, equals.get(name, None)
+                        name, variables, compat, equals.get(name)
                     )
                 except MergeError:
                     if compat != "minimal":

xarray/tests/test_coding.py

@@ -94,8 +94,8 @@ def test_coder_roundtrip() -> None:
     assert_identical(original, roundtripped)
 
 
-@pytest.mark.parametrize("dtype", "u1 u2 i1 i2 f2 f4".split())
-@pytest.mark.parametrize("dtype2", "f4 f8".split())
+@pytest.mark.parametrize("dtype", ["u1", "u2", "i1", "i2", "f2", "f4"])
+@pytest.mark.parametrize("dtype2", ["f4", "f8"])
 def test_scaling_converts_to_float(dtype: str, dtype2: str) -> None:
     dt = np.dtype(dtype2)
     original = xr.Variable(

xarray/tests/test_dask.py

@@ -1636,7 +1636,7 @@ def test_normalize_token_with_backend(map_ds):
     with create_tmp_file(allow_cleanup_failure=ON_WINDOWS) as tmp_file:
         map_ds.to_netcdf(tmp_file)
         read = xr.open_dataset(tmp_file)
-        assert not dask.base.tokenize(map_ds) == dask.base.tokenize(read)
+        assert dask.base.tokenize(map_ds) != dask.base.tokenize(read)
         read.close()