Update ruff and typings (#66)

Author: blink1073

.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
       - id: mdformat
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.0.3"
+    rev: "v3.1.0"
     hooks:
       - id: prettier
         types_or: [yaml, html, json]
@@ -49,7 +49,7 @@ repos:
         args: ["-L", "sur,nd"]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.6.1"
+    rev: "v1.7.0"
     hooks:
       - id: mypy
         files: pytest_jupyter
@@ -71,7 +71,7 @@ repos:
       - id: rst-inline-touching-normal
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.5
+    rev: v0.1.6
     hooks:
       - id: ruff
         types_or: [python, jupyter]
@@ -80,7 +80,7 @@ repos:
         types_or: [python, jupyter]
 
   - repo: https://github.com/scientific-python/cookie
-    rev: "2023.10.27"
+    rev: "2023.11.17"
     hooks:
       - id: sp-repo-review
         additional_dependencies: ["repo-review[cli]"]

docs/conf.py

@@ -18,7 +18,7 @@
 # -- Project information -----------------------------------------------------
 
 project = "pytest-jupyter"
-copyright = "2020, Project Jupyter"  # noqa
+copyright = "2020, Project Jupyter"
 author = "Project Jupyter"
 
 
@@ -33,7 +33,7 @@
 ]
 
 try:
-    import enchant  # type:ignore[import-not-found]  # noqa
+    import enchant  # type:ignore[import-not-found]  # noqa: F401
 
     extensions += ["sphinxcontrib.spelling"]
 except ImportError:

pyproject.toml

@@ -149,7 +149,6 @@ source = ["pytest_jupyter"]
 files = "pytest_jupyter"
 python_version = "3.8"
 strict = true
-show_error_codes = true
 enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
 disable_error_code = ["no-untyped-def"]
 warn_unreachable = true
@@ -158,25 +157,36 @@ warn_unreachable = true
 line-length = 100
 
 [tool.ruff.lint]
-select = [
-  "A", "B", "C", "DTZ", "E", "EM", "F", "FBT", "I", "ICN", "N",
-  "PLC", "PLE", "PLR", "PLW", "Q", "RUF", "S", "SIM", "T", "TID", "UP",
-  "W", "YTT",
+extend-select = [
+  "B",           # flake8-bugbear
+  "I",           # isort
+  "ARG",         # flake8-unused-arguments
+  "C4",          # flake8-comprehensions
+  "EM",          # flake8-errmsg
+  "ICN",         # flake8-import-conventions
+  "G",           # flake8-logging-format
+  "PGH",         # pygrep-hooks
+  "PIE",         # flake8-pie
+  "PL",          # pylint
+  "PT",          # flake8-pytest-style
+  "PTH",         # flake8-use-pathlib
+  "RET",         # flake8-return
+  "RUF",         # Ruff-specific
+  "SIM",         # flake8-simplify
+  "T20",         # flake8-print
+  "UP",          # pyupgrade
+  "YTT",         # flake8-2020
+  "EXE",         # flake8-executable
+  "NPY",         # NumPy specific rules
+  "PD",          # pandas-vet
+  "PYI",         # flake8-pyi
 ]
 ignore = [
-# 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",
-#PLR0913 Too many arguments to function call
-"PLR0913",
-# RUF012 Mutable class attributes should be annotated with `typing.ClassVar`
-"RUF012",
-]
+  "PLR",      # Design related pylint codes
+  "SIM105",   # Use `contextlib.suppress(...)`
+  "RUF012",   # Mutable class attributes should be annotated with
+  "ARG001",   # Unused function argument:
+  ]
 unfixable = [
   # Don't touch print statements
   "T201",
@@ -186,14 +196,9 @@ unfixable = [
 
 [tool.ruff.lint.per-file-ignores]
 # B011 Do not call assert False since python -O removes these calls
-# F841 local variable 'foo' is assigned to but never used
-# C408 Unnecessary `dict` call
-# E402 Module level import not at top of file
 # T201 `print` found
 # B007 Loop control variable `i` not used within the loop body.
-# N802 Function name `assertIn` should be lowercase
-# S101 Use of `assert` detected
-"tests/*" = ["B011", "F841", "C408", "E402", "T201", "B007", "N802", "S101"]
+"tests/*" = ["B011", "C4", "T201", "B007", "PTH", "ARG"]
 
 [tool.interrogate]
 ignore-init-module=true
@@ -204,6 +209,3 @@ ignore-nested-functions=true
 ignore-nested-classes=true
 fail-under=100
 exclude = ["docs", "tests"]
-
-[tool.repo-review]
-ignore = ["PY007", "PP308", "GH102"]

pytest_jupyter/__init__.py

@@ -4,4 +4,4 @@
 __all__ = ["__version__"]
 
 from ._version import __version__
-from .jupyter_core import *  # noqa
+from .jupyter_core import *  # noqa: F403

pytest_jupyter/echo_kernel.py

@@ -25,15 +25,15 @@ class EchoKernel(Kernel):
     }
     banner = "Echo kernel - as useful as a parrot"
 
-    def do_execute(
+    def do_execute(  # type:ignore[override]
         self,
         code: str,
         silent: bool,
-        store_history=True,
-        user_expressions: typing.Any = None,
+        store_history=True,  # noqa: ARG002
+        user_expressions: typing.Any = None,  # noqa: ARG002
         allow_stdin=False,
         *,
-        cell_id: str | None = None,
+        cell_id: str | None = None,  # noqa: ARG002
     ) -> dict[str, typing.Any]:
         """Execute code on the kernel."""
         if not silent:

pytest_jupyter/jupyter_client.py

@@ -5,7 +5,7 @@
 import pytest
 
 try:
-    import ipykernel  # noqa
+    import ipykernel  # noqa: F401
     from jupyter_client.kernelspec import NATIVE_KERNEL_NAME
     from jupyter_client.manager import start_new_async_kernel
 except ImportError:
@@ -20,11 +20,11 @@
     )
 
 # Bring in local plugins.
-from pytest_jupyter.jupyter_core import *  # noqa
-from pytest_jupyter.pytest_tornasync import *  # noqa
+from pytest_jupyter.jupyter_core import *  # noqa: F403
+from pytest_jupyter.pytest_tornasync import *  # noqa: F403
 
 
-@pytest.fixture
+@pytest.fixture()
 def jp_zmq_context():
     """Get a zmq context."""
     import zmq
@@ -34,7 +34,7 @@ def jp_zmq_context():
     ctx.term()
 
 
-@pytest.fixture
+@pytest.fixture()
 def jp_start_kernel(jp_environ, jp_asyncio_loop):
     """Get a function to a kernel and clean up resources when done."""
     kms = []

pytest_jupyter/jupyter_core.py

@@ -35,7 +35,7 @@
     resource.setrlimit(resource.RLIMIT_NOFILE, (soft, hard))
 
 
-@pytest.fixture
+@pytest.fixture()
 def jp_asyncio_loop():
     """Get an asyncio loop."""
     if os.name == "nt":
@@ -65,49 +65,49 @@ async def get_tornado_loop() -> typing.Any:
     return jp_asyncio_loop.run_until_complete(get_tornado_loop())
 
 
-@pytest.fixture
+@pytest.fixture()
 def jp_home_dir(tmp_path):
     """Provides a temporary HOME directory value."""
     return mkdir(tmp_path, "home")
 
 
-@pytest.fixture
+@pytest.fixture()
 def jp_data_dir(tmp_path):
     """Provides a temporary Jupyter data dir directory value."""
     return mkdir(tmp_path, "data")
 
 
-@pytest.fixture
+@pytest.fixture()
 def jp_config_dir(tmp_path):
     """Provides a temporary Jupyter config dir directory value."""
     return mkdir(tmp_path, "config")
 
 
-@pytest.fixture
+@pytest.fixture()
 def jp_runtime_dir(tmp_path):
     """Provides a temporary Jupyter runtime dir directory value."""
     return mkdir(tmp_path, "runtime")
 
 
-@pytest.fixture
+@pytest.fixture()
 def jp_system_jupyter_path(tmp_path):
     """Provides a temporary Jupyter system path value."""
     return mkdir(tmp_path, "share", "jupyter")
 
 
-@pytest.fixture
+@pytest.fixture()
 def jp_env_jupyter_path(tmp_path):
     """Provides a temporary Jupyter env system path value."""
     return mkdir(tmp_path, "env", "share", "jupyter")
 
 
-@pytest.fixture
+@pytest.fixture()
 def jp_system_config_path(tmp_path):
     """Provides a temporary Jupyter config path value."""
     return mkdir(tmp_path, "etc", "jupyter")
 
 
-@pytest.fixture
+@pytest.fixture()
 def jp_env_config_path(tmp_path):
     """Provides a temporary Jupyter env config path value."""
     return mkdir(tmp_path, "env", "etc", "jupyter")
@@ -119,7 +119,7 @@ def jp_kernel_dir(jp_data_dir):
     return mkdir(jp_data_dir, "kernels")
 
 
-@pytest.fixture
+@pytest.fixture()
 def echo_kernel_spec(jp_kernel_dir):
     """Install a kernel spec for the echo kernel."""
     test_dir = Path(jp_kernel_dir) / "echo"
@@ -131,8 +131,8 @@ def echo_kernel_spec(jp_kernel_dir):
     return str(test_dir)
 
 
-@pytest.fixture
-def jp_environ(
+@pytest.fixture()
+def jp_environ(  # noqa: PT004
     monkeypatch,
     tmp_path,
     jp_home_dir,