review changes

Author: glevco

extras/custom_checks.sh

@@ -92,10 +92,10 @@ function check_do_not_import_tests_in_hathor() {
 function check_do_not_import_from_hathor_in_entrypoints() {
     PATTERN='^import .*hathor.*\|^from .*hathor.* import'
 
-    if grep -R "$PATTERN" "hathor/cli" | grep -v '# no-custom-check'; then
+    if grep -R "$PATTERN" "hathor/cli" | grep -v 'from hathor.cli.run_node import RunNode' | grep -v '# skip-cli-import-custom-check'; then
         echo 'do not import from `hathor` in the module-level of a CLI entrypoint.'
         echo 'instead, import locally inside the function that uses the import.'
-        echo 'alternatively, comment `# no-custom-check` to exclude a line.'
+        echo 'alternatively, comment `# skip-cli-import-custom-check` to exclude a line.'
         return 1
     fi
     return 0

hathor/cli/db_export.py

@@ -17,7 +17,7 @@
 from argparse import ArgumentParser, FileType
 from typing import TYPE_CHECKING, Iterator, Optional
 
-from hathor.cli.run_node import RunNode  # no-custom-check
+from hathor.cli.run_node import RunNode
 
 if TYPE_CHECKING:
     from hathor.transaction import BaseTransaction

hathor/cli/db_import.py

@@ -18,7 +18,7 @@
 from argparse import ArgumentParser, FileType
 from typing import TYPE_CHECKING, Iterator
 
-from hathor.cli.run_node import RunNode  # no-custom-check
+from hathor.cli.run_node import RunNode
 
 if TYPE_CHECKING:
     from hathor.transaction import BaseTransaction

hathor/cli/events_simulator/event_forwarding_websocket_factory.py

@@ -16,7 +16,7 @@
 
 from twisted.internet.interfaces import IAddress
 
-from hathor.event.websocket import EventWebsocketFactory  # no-custom-check
+from hathor.event.websocket import EventWebsocketFactory  # skip-cli-import-custom-check
 
 if TYPE_CHECKING:
     from hathor.cli.events_simulator.event_forwarding_websocket_protocol import EventForwardingWebsocketProtocol

hathor/cli/events_simulator/event_forwarding_websocket_protocol.py

@@ -16,7 +16,7 @@
 
 from autobahn.websocket import ConnectionRequest
 
-from hathor.event.websocket import EventWebsocketProtocol  # no-custom-check
+from hathor.event.websocket import EventWebsocketProtocol  # skip-cli-import-custom-check
 
 if TYPE_CHECKING:
     from hathor.cli.events_simulator.event_forwarding_websocket_factory import EventForwardingWebsocketFactory

hathor/cli/openapi_files/register.py

@@ -14,7 +14,7 @@
 
 from typing import TypeVar
 
-from hathor.api_util import Resource  # no-custom-check
+from hathor.api_util import Resource  # skip-cli-import-custom-check
 
 _registered_resources: list[type[Resource]] = []
 

hathor/cli/quick_test.py

@@ -14,7 +14,7 @@
 
 from argparse import ArgumentParser
 
-from hathor.cli.run_node import RunNode  # no-custom-check
+from hathor.cli.run_node import RunNode
 
 
 class QuickTest(RunNode):

hathor/cli/run_node_args.py

@@ -16,8 +16,8 @@
 
 from pydantic import Extra
 
-from hathor.feature_activation.feature import Feature  # no-custom-check
-from hathor.utils.pydantic import BaseModel  # no-custom-check
+from hathor.feature_activation.feature import Feature  # skip-cli-import-custom-check
+from hathor.utils.pydantic import BaseModel  # skip-cli-import-custom-check
 
 
 class RunNodeArgs(BaseModel, extra=Extra.allow):

hathor/cli/shell.py

@@ -15,7 +15,7 @@
 from argparse import Namespace
 from typing import Any, Callable
 
-from hathor.cli.run_node import RunNode  # no-custom-check
+from hathor.cli.run_node import RunNode
 
 
 def get_ipython(extra_args: list[Any], imported_objects: dict[str, Any]) -> Callable[[], None]: