Enforce ruff/Pylint Refactor rules (PLR)

pyproject.toml

@@ -261,6 +261,7 @@ extend-select = [
   "W",    # pycodestyle warnings
   "PGH",  # pygrep-hooks
   "PLE",  # Pylint Errors
+  "PLR",  # Pylint Refactor
   "PLW",  # Pylint Warnings
   "UP",   # pyupgrade
   "FURB", # refurb
@@ -277,6 +278,8 @@ ignore = [
   "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
+  "PLR091",  # too many arguments / branches / statements
+  "PLR2004", # magic value used in comparison
   "PLW0603", # using the global statement to update is discouraged
   "PLW0642", # reassigned `self` variable in instance method
   "PLW1641", # object does not implement `__hash__` method
@@ -293,6 +296,8 @@ ignore = [
 [tool.ruff.lint.per-file-ignores]
 # don't enforce absolute imports
 "asv_bench/**" = ["TID252"]
+# comparison with itself in tests
+"xarray/tests/**" = ["PLR0124"]
 # looks like ruff bugs
 "xarray/core/_typed_ops.py" = ["PYI034"]
 "xarray/namedarray/_typing.py" = ["PYI018", "PYI046"]

xarray/coding/strings.py

@@ -129,15 +129,14 @@ def validate_char_dim_name(strlen, encoding, name) -> str:
                     "To silence this warning either remove 'char_dim_name' from encoding or provide a fitting name."
                 )
             char_dim_name = f"{new_dim_name}{strlen}"
-        else:
-            if (
-                original_shape := encoding.get("original_shape", [-1])[-1]
-            ) != -1 and original_shape != strlen:
-                emit_user_level_warning(
-                    f"String dimension length mismatch on variable {name!r}. '{original_shape}' provided by encoding, but data has length of '{strlen}'. Using '{char_dim_name}{strlen}' instead of {char_dim_name!r} to prevent possible naming clash.\n"
-                    f"To silence this warning remove 'original_shape' from encoding."
-                )
-                char_dim_name = f"{char_dim_name}{strlen}"
+        elif (
+            original_shape := encoding.get("original_shape", [-1])[-1]
+        ) != -1 and original_shape != strlen:
+            emit_user_level_warning(
+                f"String dimension length mismatch on variable {name!r}. '{original_shape}' provided by encoding, but data has length of '{strlen}'. Using '{char_dim_name}{strlen}' instead of {char_dim_name!r} to prevent possible naming clash.\n"
+                f"To silence this warning remove 'original_shape' from encoding."
+            )
+            char_dim_name = f"{char_dim_name}{strlen}"
     else:
         char_dim_name = f"string{strlen}"
 

xarray/core/duck_array_ops.py

@@ -193,7 +193,7 @@
         # types. For full consistency with pandas, we should accept None as
         # a null value as well as NaN, but it isn't clear how to do this
         # with duck typing.
-        return data != data
+        return data != data  # noqa: PLR0124
 
 
 def notnull(data):
@@ -250,7 +250,7 @@
 
     if xp == np:
         # numpy currently doesn't have a astype:
         return data.astype(dtype, **kwargs)
     return xp.astype(data, dtype, **kwargs)