Remove .ruff.toml and refactor imports to use consistent typing and

formatting

Author: Евгений Блинов

.ruff.toml

@@ -1,3 +1,7 @@
-from displayhooks.converter import converted_displayhook as converted_displayhook  # noqa: F401
-from displayhooks.autorestore import autorestore_displayhook as autorestore_displayhook  # noqa: F401
-from displayhooks.not_display import not_display as not_display  # noqa: F401
+from displayhooks.autorestore import (
+    autorestore_displayhook as autorestore_displayhook,
+)
+from displayhooks.converter import (
+    converted_displayhook as converted_displayhook,
+)
+from displayhooks.not_display import not_display as not_display

displayhooks/__init__.py

@@ -5,9 +5,8 @@
 else:
     from typing_extensions import ParamSpec  # pragma: no cover
 
-from typing import TypeVar, Callable
 from functools import wraps
-
+from typing import Callable, TypeVar
 
 FunctionParameters = ParamSpec('FunctionParameters')
 ReturningValue = TypeVar('ReturningValue')

displayhooks/autorestore.py

@@ -1,8 +1,7 @@
 import sys
-from typing import Callable, Any
-from threading import Lock
 from functools import wraps
-
+from threading import Lock
+from typing import Any, Callable
 
 lock = Lock()
 

displayhooks/converter.py

@@ -1,4 +1,4 @@
-from typing import Type, Any
+from typing import Any, Type
 
 from displayhooks.converter import converted_displayhook
 

displayhooks/not_display.py

@@ -46,6 +46,11 @@ keywords = [
 paths_to_mutate="displayhooks"
 runner="pytest"
 
+[tool.ruff]
+lint.ignore = ['E501', 'E712', 'PTH123', 'PTH118', 'PLR2004', 'PTH107', 'SIM105', 'SIM102', 'RET503', 'PLR0912', 'C901']
+lint.select = ["ERA001", "YTT", "ASYNC", "BLE", "B", "A", "COM", "INP", "PIE", "T20", "PT", "RSE", "RET", "SIM", "SLOT", "TID252", "ARG", "PTH", "I", "C90", "N", "E", "W", "D201", "D202", "D419", "F", "PL", "PLE", "PLR", "PLW", "RUF", "TRY201", "TRY400", "TRY401"]
+format.quote-style = "single"
+
 [project.urls]
 'Source' = 'https://github.com/pomponchik/displayhooks'
 'Tracker' = 'https://github.com/pomponchik/displayhooks/issues'

pyproject.toml

@@ -5,16 +5,16 @@
 
 import pytest
 
-from displayhooks import converted_displayhook, autorestore_displayhook
+from displayhooks import autorestore_displayhook, converted_displayhook
 
 
 @pytest.mark.parametrize(
-    ['value'],
+    'value',
     [
-        ('kek',),
-        ('lol',),
-        (1,),
-        (1.5,),
+        'kek',
+        'lol',
+        1,
+        1.5,
     ],
 )
 @autorestore_displayhook
@@ -29,7 +29,7 @@ def new_displayhook(value: Any) -> Any:
 
     output = buffer.getvalue()
 
-    assert output == f'{repr(value)}\n'
+    assert output == f'{value!r}\n'
 
 
 @autorestore_displayhook
@@ -48,18 +48,18 @@ def new_displayhook(value: Any) -> Any:
 
 
 @pytest.mark.parametrize(
-    ['value'],
+    'value',
     [
-        ('kek',),
-        ('lol',),
-        (1,),
-        (1.5,),
+        'kek',
+        'lol',
+        1,
+        1.5,
     ],
 )
 @autorestore_displayhook
 def test_elliminating_convertion(value):
     @converted_displayhook
-    def new_displayhook(value: Any) -> Any:
+    def new_displayhook(value: Any) -> Any:  # noqa: ARG001
         return None
 
     buffer = io.StringIO()
@@ -74,7 +74,7 @@ def new_displayhook(value: Any) -> Any:
 @autorestore_displayhook
 def test_elliminating_convertion_with_none():
     @converted_displayhook
-    def new_displayhook(value: Any) -> Any:
+    def new_displayhook(value: Any) -> Any:  # noqa: ARG001
         return None
 
     buffer = io.StringIO()
@@ -87,18 +87,18 @@ def new_displayhook(value: Any) -> Any:
 
 
 @pytest.mark.parametrize(
-    ['value'],
+    'value',
     [
-        ('kek',),
-        ('lol',),
-        (1,),
-        (1.5,),
+        'kek',
+        'lol',
+        1,
+        1.5,
     ],
 )
 @autorestore_displayhook
 def test_real_convertion(value):
     @converted_displayhook
-    def new_displayhook(value: Any) -> Any:
+    def new_displayhook(value: Any) -> Any:  # noqa: ARG001
         return 'cheburek'
 
     buffer = io.StringIO()
@@ -107,4 +107,4 @@ def new_displayhook(value: Any) -> Any:
 
     output = buffer.getvalue()
 
-    assert output == f'{repr("cheburek")}\n'
+    assert output == f'{"cheburek"!r}\n'

tests/test_converter.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from displayhooks import not_display, autorestore_displayhook
+from displayhooks import autorestore_displayhook, not_display
 
 
 @autorestore_displayhook
@@ -19,21 +19,21 @@ def display_something(something):
         return buffer.getvalue()
 
     assert display_something(5) == ''
-    assert display_something('kek') == f'{repr("kek")}\n'
+    assert display_something('kek') == f'{"kek"!r}\n'
 
 
 @pytest.mark.parametrize(
-    ['callable'],
+    'some_callable',
     [
-        (lambda: not_display(int, float),),
-        (lambda: [not_display(int), not_display(float)],),  # type: ignore[func-returns-value]
-        (lambda: not_display(float, int),),
-        (lambda: [not_display(float), not_display(int)],),  # type: ignore[func-returns-value]
+        lambda: not_display(int, float),
+        lambda: [not_display(int), not_display(float)],  # type: ignore[func-returns-value]
+        lambda: not_display(float, int),
+        lambda: [not_display(float), not_display(int)],  # type: ignore[func-returns-value]
     ],
 )
 @autorestore_displayhook
-def test_not_display_ints_and_floats(callable):
-    callable()
+def test_not_display_ints_and_floats(some_callable):
+    some_callable()
 
     def display_something(something):
         buffer = io.StringIO()
@@ -44,4 +44,4 @@ def display_something(something):
 
     assert display_something(5) == ''
     assert display_something(5.5) == ''
-    assert display_something('kek') == f'{repr("kek")}\n'
+    assert display_something('kek') == f'{"kek"!r}\n'