Replace flake8 and black with ruff

.github/workflows/ci.yml

@@ -25,7 +25,9 @@ jobs:
       - name: Install dependencies
         run: poetry install
       - name: Lint
-        run: poetry run flake8
+        run: poetry run ruff .
+      - name: Format
+        run: poetry run ruff format --check .
 
   test:
     name: Test on ${{ matrix.name }}

.pre-commit-config.yaml

@@ -1,16 +1,20 @@
 repos:
 - repo: local
   hooks:
-  - id: flake8
-    name: Linting
-    entry: poetry run flake8
+  - id: ruff (format)
+    name: Format
+    entry: poetry run ruff format
+    language: system
+    types: [python]
+    require_serial: true
+  - id: ruff (lint)
+    name: Lint
+    entry: poetry run ruff --fix
     language: system
     types: [python]
     require_serial: true
-- repo: local
-  hooks:
   - id: pytest
-    name: Tests
+    name: Test
     entry: poetry run pytest tests
     language: system
     types: [python]

examples/store_with_undo_redo.py

@@ -3,7 +3,7 @@
 for undo/redo functionality
 """
 from observ import watch
-from observ.store import computed, mutation, Store
+from observ.store import Store, computed, mutation
 
 
 class CounterStore(Store):

observ/__init__.py

@@ -11,4 +11,4 @@
     to_raw,
 )
 from .scheduler import scheduler
-from .watcher import computed, watch, watch_effect, Watcher
+from .watcher import Watcher, computed, watch, watch_effect

observ/dep.py

@@ -2,13 +2,15 @@
 Deps implement the classic observable pattern, and
 are attached to observable datastructures.
 """
-from typing import List
+from __future__ import annotations
+
+from typing import ClassVar
 from weakref import WeakSet
 
 
 class Dep:
     __slots__ = ("_subs", "__weakref__")
-    stack: List["Watcher"] = []  # noqa: F821
+    stack: ClassVar[list["Watcher"]] = []  # noqa: F821
 
     def __init__(self) -> None:
         self._subs: WeakSet["Watcher"] = None  # noqa: F821

observ/dict_proxy.py

@@ -1,8 +1,7 @@
-from .proxy import Proxy, TYPE_LOOKUP
+from .proxy import TYPE_LOOKUP, Proxy
 from .proxy_db import proxy_db
 from .traps import construct_methods_traps_dict, trap_map, trap_map_readonly
 
-
 dict_traps = {
     "READERS": {
         "copy",

observ/list_proxy.py

@@ -1,7 +1,6 @@
-from .proxy import Proxy, TYPE_LOOKUP
+from .proxy import TYPE_LOOKUP, Proxy
 from .traps import construct_methods_traps_dict, trap_map, trap_map_readonly
 
-
 list_traps = {
     "READERS": {
         "count",

observ/proxy.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import partial
-from typing import cast, Generic, Literal, TypedDict, TypeVar
+from typing import Generic, Literal, TypedDict, TypeVar, cast
 
 from .proxy_db import proxy_db
 

observ/scheduler.py

@@ -3,10 +3,10 @@
 and should be integrated in the event loop of your choosing.
 """
 import asyncio
-from bisect import bisect
-from collections import defaultdict
 import importlib
 import warnings
+from bisect import bisect
+from collections import defaultdict
 
 
 class Scheduler:
@@ -65,7 +65,7 @@ def register_qt(self):
         """
         for qt in ("PySide6", "PyQt6", "PySide2", "PyQt5", "PySide", "PyQt4"):
             try:
-                QtCore = importlib.import_module(f"{qt}.QtCore")
+                QtCore = importlib.import_module(f"{qt}.QtCore")  # noqa: N806
                 break
             except ImportError:
                 continue
@@ -78,7 +78,7 @@ def register_qt(self):
             warnings.warn(
                 "QtAsyncio module available: please consider using `register_asyncio` "
                 "and call the following code:\n"
-                f"    from {qt} import QtAsyncio\n"  # noqa: E272
+                f"    from {qt} import QtAsyncio\n"
                 "    asyncio.set_event_loop_policy(QtAsyncio.QAsyncioEventLoopPolicy())"
                 ""
             )

observ/set_proxy.py

@@ -1,7 +1,6 @@
-from .proxy import Proxy, TYPE_LOOKUP
+from .proxy import TYPE_LOOKUP, Proxy
 from .traps import construct_methods_traps_dict, trap_map, trap_map_readonly
 
-
 set_traps = {
     "READERS": {
         "copy",

observ/store.py

@@ -11,7 +11,6 @@
 )
 from .watcher import computed as computed_expression
 
-
 T = TypeVar("T", bound=Callable)
 
 

observ/watcher.py

@@ -6,20 +6,19 @@
 from __future__ import annotations
 
 import asyncio
+import inspect
 from collections.abc import Awaitable, Container
 from functools import partial, wraps
-import inspect
 from itertools import count
 from typing import Any, Callable, Generic, Optional, TypeVar, Union
-from weakref import ref, WeakSet
+from weakref import WeakSet, ref
 
 from .dep import Dep
 from .dict_proxy import DictProxyBase
 from .list_proxy import ListProxyBase
 from .scheduler import scheduler
 from .set_proxy import SetProxyBase
 
-
 T = TypeVar("T")
 Watchable = Union[
     Callable[[], T],