bump ruff to 0.14.8, resolve issues

Author: mr-mixas

nested_diff/cli.py

@@ -57,7 +57,7 @@ def _decode_fmt_opts(opts):
         if opts is None:
             return {}
 
-        import json
+        import json  # noqa: PLC0415
 
         return json.loads(opts)
 
@@ -345,7 +345,7 @@ def __init__(self, **kwargs):
         """
         super().__init__()
 
-        import json
+        import json  # noqa: PLC0415
 
         self.encoder = json.JSONEncoder(**self.get_opts(kwargs))
 
@@ -383,7 +383,7 @@ def __init__(self, **kwargs):
         """
         super().__init__()
 
-        import json
+        import json  # noqa: PLC0415
 
         self.decoder = json.JSONDecoder(**self.get_opts(kwargs))
 
@@ -404,8 +404,8 @@ def __init__(self, **kwargs):
         """
         super().__init__()
 
-        import configparser
-        import io
+        import configparser  # noqa: PLC0415
+        import io  # noqa: PLC0415
 
         self.encoder = configparser.ConfigParser(**self.get_opts(kwargs))
         self.stringio = io.StringIO()
@@ -430,7 +430,7 @@ def __init__(self, **kwargs):
         """
         super().__init__()
 
-        import configparser
+        import configparser  # noqa: PLC0415
 
         self.decoder = configparser.ConfigParser(**kwargs)
 
@@ -457,7 +457,7 @@ def __init__(self, **kwargs):
         """Initialize dumper."""
         super().__init__()
 
-        import pprint
+        import pprint  # noqa: PLC0415
 
         self.codec = pprint.PrettyPrinter(**self.get_opts(kwargs))
 
@@ -495,7 +495,7 @@ def __init__(self):
         """Initialize dumper."""
         super().__init__()
 
-        import tomli_w
+        import tomli_w  # noqa: PLC0415
 
         self.codec = tomli_w
 
@@ -512,9 +512,9 @@ def __init__(self):
         super().__init__()
 
         if sys.version_info >= (3, 11):
-            import tomllib  # pragma nocover
+            import tomllib  # pragma nocover # noqa: PLC0415
         else:
-            import tomli as tomllib  # pragma nocover
+            import tomli as tomllib  # pragma nocover # noqa: PLC0415
 
         self.codec = tomllib
 
@@ -535,12 +535,12 @@ def __init__(self, **kwargs):
         """
         super().__init__()
 
-        import yaml
+        import yaml  # noqa: PLC0415
 
         try:
-            from yaml import CSafeDumper as ImportedYamlDumper
+            from yaml import CSafeDumper as ImportedYamlDumper  # noqa: PLC0415
         except ImportError:
-            from yaml import SafeDumper as ImportedYamlDumper
+            from yaml import SafeDumper as ImportedYamlDumper  # noqa: PLC0415
 
         class _YamlDumper(ImportedYamlDumper):
             def represent_scalar(self, tag, value, style=None):
@@ -588,16 +588,18 @@ def __init__(self, **kwargs):
         """
         super().__init__()
 
-        import yaml
+        import yaml  # noqa: PLC0415
 
         try:
-            from yaml import CSafeLoader as YamlLoader
+            from yaml import CSafeLoader as YamlLoader  # noqa: PLC0415
         except ImportError:
-            from yaml import SafeLoader as YamlLoader
+            from yaml import SafeLoader as YamlLoader  # noqa: PLC0415
 
-        from yaml.nodes import MappingNode as YamlMappingNode
-        from yaml.nodes import ScalarNode as YamlScalarNode
-        from yaml.nodes import SequenceNode as YamlSequenceNode
+        from yaml.nodes import (  # noqa: PLC0415
+            MappingNode as YamlMappingNode,
+            ScalarNode as YamlScalarNode,
+            SequenceNode as YamlSequenceNode,
+        )
 
         self.opts = self.get_opts(kwargs)
         self.yaml = yaml

nested_diff/diff_tool.py

@@ -279,7 +279,7 @@ def __init__(  # noqa: PLR0913
             kwargs: Passed to base formatter as is.
 
         """
-        import nested_diff.formatters
+        import nested_diff.formatters  # noqa: PLC0415
 
         if fmt == 'term':
             base_class = nested_diff.formatters.TermFormatter

pyproject.toml

@@ -57,7 +57,7 @@ test = [
     'pytest',
     'pytest-cov',
     'pytest-ruff',
-    'ruff==0.11.13',
+    'ruff==0.14.8',
 ]
 
 [project.scripts]
@@ -114,5 +114,8 @@ ignore = [
 [tool.ruff.lint.flake8-quotes]
 inline-quotes = 'single'
 
+[tool.ruff.lint.isort]
+combine-as-imports = true
+
 [tool.ruff.lint.pydocstyle]
 convention = 'google'

tests/test_diff.py

@@ -80,8 +80,8 @@ def test_different_object_attributes():
     reason='reducer_override appeared in 3.8',
 )
 def test_custom_dumper():
-    import io
-    import pickle
+    import io  # noqa: PLC0415
+    import pickle  # noqa: PLC0415
 
     class ClassToTestDiff:
         pass

tests/test_patch.py

@@ -58,7 +58,7 @@ def test_text_unsupported_op():
 
 
 def test_incorrect_diff_format():
-    with pytest.raises(ValueError, match="{'garbage': 'passed'}"):
+    with pytest.raises(ValueError, match=r"{'garbage': 'passed'}"):
         Patcher().patch({}, {'garbage': 'passed'})