Add more linting (#48)

Author: blink1073

.pre-commit-config.yaml

@@ -35,7 +35,7 @@ repos:
       - id: black
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.206
+    rev: v0.0.237
     hooks:
       - id: ruff
         args: ["--fix"]

docs/conf.py

@@ -18,7 +18,7 @@
 # -- Project information -----------------------------------------------------
 
 project = "pytest-jupyter"
-copyright = "2020, Project Jupyter"
+copyright = "2020, Project Jupyter"  # noqa
 author = "Project Jupyter"
 
 

pyproject.toml

@@ -97,7 +97,7 @@ test = "mypy --install-types --non-interactive {args:.}"
 dependencies = [
   "black[jupyter]==22.12.0",
   "mdformat>0.7",
-  "ruff==0.0.206",
+  "ruff==0.0.237",
 ]
 detached = true
 [tool.hatch.envs.lint.scripts]
@@ -165,38 +165,19 @@ target-version = ["py38"]
 target-version = "py38"
 line-length = 100
 select = [
-  "A", "B", "C", "E", "EM", "F", "FBT", "I", "N", "Q", "RUF", "S", "T",
-  "UP", "W", "YTT",
+  "A", "B", "C", "DTZ", "E", "EM", "F", "FBT", "I", "ICN", "ISC", "N",
+  "PLC", "PLE", "PLR", "PLW", "Q", "RUF", "S", "SIM", "T", "TID", "UP",
+  "W", "YTT",
 ]
 ignore = [
-  # Allow non-abstract empty methods in abstract base classes
-  "B027",
-  # Ignore McCabe complexity
-  "C901",
-  # Allow boolean positional values in function calls, like `dict.get(... True)`
-  "FBT003",
-  # Use of `assert` detected
-  "S101",
-  # Line too long
-  "E501",
-  # Relative imports are banned
-  "I252",
-  # Boolean ... in function definition
-  "FBT001",
-  "FBT002",
-  # Module level import not at top of file
-  "E402",
-  # A001/A002/A003 .. is shadowing a python builtin
-  "A001",
-  "A002",
-  "A003",
-  # Possible hardcoded password
-  "S105",
-  "S106",
-  # Q000 Single quotes found but double quotes preferred
-  "Q000",
-  # N806 Variable `B` in function should be lowercase
-  "N806",
+# Q000 Single quotes found but double quotes preferred
+"Q000",
+# FBT001 Boolean positional arg in function definition
+"FBT001", "FBT002", "FBT003",
+# E501 Line too long (158 > 100 characters)
+"E501",
+# SIM105 Use `contextlib.suppress(...)`
+"SIM105",
 ]
 unfixable = [
   # Don't touch print statements
@@ -213,7 +194,8 @@ unfixable = [
 # T201 `print` found
 # B007 Loop control variable `i` not used within the loop body.
 # N802 Function name `assertIn` should be lowercase
-"tests/*" = ["B011", "F841", "C408", "E402", "T201", "B007", "N802"]
+# S101 Use of `assert` detected
+"tests/*" = ["B011", "F841", "C408", "E402", "T201", "B007", "N802", "S101"]
 
 [tool.interrogate]
 ignore-init-module=true

pytest_jupyter/jupyter_client.py

@@ -53,4 +53,5 @@ async def inner(kernel_name=NATIVE_KERNEL_NAME, **kwargs):
 
     for km in kms:
         jp_asyncio_loop.run_until_complete(km.shutdown_kernel(now=True))
-        assert km.context.closed
+        if not km.context.closed:
+            raise AssertionError

pytest_jupyter/jupyter_server.py

@@ -31,7 +31,7 @@
     from tornado.websocket import WebSocketHandler
     from traitlets.config import Config
 
-    is_v2 = version_info[0] == 2
+    is_v2 = version_info[0] == 2  # noqa
 
 except ImportError:
     Authorizer = object  # type:ignore
@@ -405,10 +405,7 @@ def send_request(jp_fetch, jp_ws_fetch):
     """Send to Jupyter Server and return response code."""
 
     async def _(url, **fetch_kwargs):
-        if url.endswith("channels") or "/websocket/" in url:
-            fetch = jp_ws_fetch
-        else:
-            fetch = jp_fetch
+        fetch = jp_ws_fetch if url.endswith("channels") or "/websocket/" in url else jp_fetch
 
         try:
             r = await fetch(url, **fetch_kwargs, allow_nonstandard_methods=True)
@@ -494,10 +491,7 @@ def normalize_url(self, path):
     def is_authorized(self, handler, user, action, resource):
         """Test if a request is authorized."""
         # Parse Request
-        if isinstance(handler, WebSocketHandler):
-            method = "WEBSOCKET"
-        else:
-            method = handler.request.method
+        method = "WEBSOCKET" if isinstance(handler, WebSocketHandler) else handler.request.method
         url = self.normalize_url(handler.request.path)
 
         # Map request parts to expected action and resource.
@@ -506,8 +500,8 @@ def is_authorized(self, handler, user, action, resource):
 
         # Assert that authorization layer returns the
         # correct action + resource.
-        assert action == expected_action
-        assert resource == expected_resource
+        if action != expected_action or resource != expected_resource:
+            raise AssertionError
 
         # Now, actually apply the authorization layer.
         return all(

tests/test_jupyter_server.py

@@ -20,12 +20,12 @@ def test_skip(jp_serverapp):
 
 async def test_get_api_spec(jp_fetch):
     response = await jp_fetch("api", "spec.yaml", method="GET")
-    assert response.code == 200
+    assert response.code == 200  # noqa
 
 
 async def test_send_request(send_request):
     code = await send_request("api/spec.yaml", method="GET")
-    assert code == 200
+    assert code == 200  # noqa
 
 
 async def test_connection(jp_fetch, jp_ws_fetch, jp_http_port, jp_auth_header):