bump ruff to 0.8.0, refactor ruff opts and code

Author: mr-mixas

nested_diff/__init__.py

@@ -98,7 +98,7 @@ class Differ:
 
     default_differ = DEFAULT_HANDLER.diff
 
-    def __init__(
+    def __init__(  # noqa: PLR0913
         self,
         A=True,  # noqa: N803
         N=True,  # noqa: N803

nested_diff/cli.py

@@ -552,17 +552,15 @@ def __init__(self, **kwargs):
 
         import yaml
 
-        from yaml.nodes import (
-            ScalarNode as YamlScalarNode,
-            SequenceNode as YamlSequenceNode,
-            MappingNode as YamlMappingNode,
-        )
-
         try:
             from yaml import CSafeLoader as YamlLoader
         except ImportError:
             from yaml import SafeLoader as YamlLoader
 
+        from yaml.nodes import MappingNode as YamlMappingNode
+        from yaml.nodes import ScalarNode as YamlScalarNode
+        from yaml.nodes import SequenceNode as YamlSequenceNode
+
         self.opts = self.get_opts(kwargs)
         self.yaml = yaml
         self.yaml_loader = YamlLoader

nested_diff/diff_tool.py

@@ -66,17 +66,17 @@ def diff(self, a, b, **kwargs):
 
         return differ.diff(a, b)
 
-    def generate_diffs(self):
+    def generate_diffs(self):  # noqa: C901
         """Generate diffs."""
         a = None
         headers_enabled = False
 
         if self.args.show:
             if len(self.args.files) > 1:
                 headers_enabled = True
-        elif len(self.args.files) < 2:
+        elif len(self.args.files) < 2:  # noqa: PLR2004
             self.argparser.error('Two or more arguments expected for diff')
-        elif len(self.args.files) > 2:
+        elif len(self.args.files) > 2:  # noqa: PLR2004
             headers_enabled = True
 
         for file_ in self.args.files:
@@ -254,7 +254,7 @@ class FormatterDumper(nested_diff.cli.Dumper):
 
     supported_fmts = ('term', 'text', 'html')
 
-    def __init__(
+    def __init__(  # noqa: PLR0913
         self,
         fmt,
         header=None,

nested_diff/formatters.py

@@ -356,18 +356,7 @@ def get_script(self):
     }
 })
 """
-        lines = []
-        for line in script.split('\n'):
-            try:
-                comment_starts = line.index('//')
-            except ValueError:
-                pass
-            else:
-                line = line[:comment_starts]
-
-            lines.append(line.strip())
-
-        return ''.join(lines)
+        return ''.join(x.split('//', 1)[0].strip() for x in script.split('\n'))
 
     def format_key(self, key):
         """Return key/index representation."""

nested_diff/handlers.py

@@ -320,7 +320,7 @@ def __init__(self):
         super().__init__()
         self.lcs = SequenceMatcher(isjunk=None, autojunk=False)
 
-    def diff(self, differ, a, b):
+    def diff(self, differ, a, b):  # noqa: C901 PLR0912
         """Calculate diff for two list objects.
 
         Args:
@@ -598,7 +598,7 @@ def patch(self, patcher, target, diff):  # noqa: ARG002
         for subdiff in diff['D']:
             try:
                 target.add(subdiff['A'])
-            except KeyError:
+            except KeyError:  # noqa: PERF203
                 try:
                     target.remove(subdiff['R'])
                 except KeyError:

pyproject.toml

@@ -56,7 +56,7 @@ test = [
     'pytest',
     'pytest-cov',
     'pytest-ruff',
-    'ruff==0.6.3',
+    'ruff==0.8.0',
 ]
 
 [project.scripts]
@@ -92,48 +92,23 @@ docstring-code-format = true
 quote-style = 'single'
 
 [tool.ruff.lint]
-select = [
-    'A',
-    'ARG',
-    'B',
-    'BLE',
-    'C4',
-    'COM',
-    'D',
-    'DTZ',
-    'E',
-    'ERA',
-    'EXE',
-#    'FBT',  # TODO
-    'FLY',
-    'G',
-    'ICN',
-    'ISC',
-    'LOG',
-    'N',
-    'PGH',
-    'PIE',
-    'PT',
-#    'PL',  # TODO
-    'PLE',
-    'Q',
-    'RET',
-    'RSE',
-    'RUF',
-    'SIM',
-    'SLF',
-    'TD',
-    'UP',
-    'W',
-]
+select = ['ALL']  # IMPORTANT: keep ruff version pinned!
 ignore = [
-    'D407',  # Missing dashed underline after section
+    'ANN',  # TODO: enable
+    'EM101',  # Exception must not use a string literal, assign to variable...
+    'EM102',  # Exception must not use an f-string literal
+    'FBT002',  # TODO: enable
+    'PTH',  # ... should be replaced by `Path...
     'SIM105',  # contextlib.suppress is slower than try-except-pass
+    'TRY003',  # Avoid specifying long messages outside the exception class
 ]
 
 [tool.ruff.lint.extend-per-file-ignores]
 'tests/*' = [
     'D',  # docstrings
+    'PLR2004',  # Magic value used in comparison...
+    'S101',  # Use of `assert`
+    'T201',  # `print` found
 ]
 
 [tool.ruff.lint.flake8-quotes]

tests/cli/__init__.py

@@ -1,6 +1,7 @@
-import pytest
 import sys
 
+import pytest
+
 from nested_diff import cli
 
 

tests/cli/test_cli.py

@@ -1,10 +1,10 @@
 import builtins
 import json
-import pytest
 import sys
-
 from unittest import mock
 
+import pytest
+
 import nested_diff.diff_tool
 
 

tests/cli/test_diff_tool.py

@@ -1,9 +1,9 @@
 import io
 import json
-import pytest
-
-from unittest import mock
 from shutil import copyfile
+from unittest import mock
+
+import pytest
 
 import nested_diff.patch_tool
 

tests/cli/test_patch_tool.py

@@ -1,4 +1,5 @@
 import os
+
 import pytest
 
 

tests/common.py

@@ -1,8 +1,7 @@
 import os
-import pytest
-
 from io import StringIO
 
+import pytest
 
 pytest.register_assert_rewrite('tests.common')
 

tests/conftest.py

@@ -2,9 +2,8 @@
 
 import html
 
-from nested_diff.formatters import HtmlFormatter, TextFormatter
-
 import tests.data.formatters
+from nested_diff.formatters import HtmlFormatter, TextFormatter
 
 
 def main():

tests/data/__init__.py

@@ -1,5 +1,4 @@
 import sys
-
 from pickle import dumps
 
 from nested_diff.handlers import FloatHandler, TextHandler

tests/data/gen_html_compare.py

@@ -1,8 +1,8 @@
-import pytest
 import sys
 
-from nested_diff import Differ, diff, handlers
+import pytest
 
+from nested_diff import Differ, diff, handlers
 from tests.data import specific, standard
 
 TESTS = {}

tests/data/specific.py

@@ -1,10 +1,8 @@
 import pytest
 
-from nested_diff.formatters import HtmlFormatter
-
 import tests.data.formatters
 import tests.data.formatters.HtmlFormatter
-
+from nested_diff.formatters import HtmlFormatter
 from tests.common import do_test_function, iterate_test_suite
 
 

tests/test_diff.py

@@ -1,10 +1,8 @@
 import pytest
 
-from nested_diff.formatters import TermFormatter
-
 import tests.data.formatters
 import tests.data.formatters.TermFormatter
-
+from nested_diff.formatters import TermFormatter
 from tests.common import do_test_function, iterate_test_suite
 
 

tests/test_fmt_html.py

@@ -1,10 +1,8 @@
 import pytest
 
-from nested_diff.formatters import TextFormatter
-
 import tests.data.formatters
 import tests.data.formatters.TextFormatter
-
+from nested_diff.formatters import TextFormatter
 from tests.common import do_test_function, iterate_test_suite
 
 

tests/test_fmt_term.py

@@ -1,6 +1,6 @@
 import pytest
 
-from nested_diff import Iterator, Differ
+from nested_diff import Differ, Iterator
 
 
 def test_scalar_diff():
@@ -118,7 +118,7 @@ def test_set_diff():
 
 
 def test_unknown_containers():
-    class UnknownContainer(tuple):
+    class UnknownContainer(tuple):  # noqa: SLOT001
         pass
 
     d = {'D': UnknownContainer([{'O': 0, 'N': 1}])}

tests/test_fmt_text.py

@@ -1,7 +1,6 @@
 import pytest
 
 from nested_diff import Differ, Patcher, patch
-
 from tests.data import specific, standard
 
 TESTS = {}