Fix Server Version Handling and Clean up CI (#71)

Author: blink1073

.github/workflows/test.yml

@@ -45,7 +45,12 @@ jobs:
         uses: actions/checkout@v3
       - name: Base Setup
         uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
+      - name: Run the tests on pypy
+        if: ${{ startsWith(matrix.python-version, 'pypy') }}
+        run: |
+          hatch run test:nowarn || hatch run test:nowarn --lf
       - name: Run the tests
+        if: ${{ !startsWith(matrix.python-version, 'pypy') }}
         run: |
           hatch run cov:test --cov-fail-under 75 || hatch run test:test --lf
       - name: Coverage

.pre-commit-config.yaml

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

jupyter_server_terminals/__init__.py

@@ -1,11 +1,14 @@
 from ._version import __version__  # noqa:F401
 
 try:
-    from .app import TerminalsExtensionApp
+    from jupyter_server._version import version_info
 except ModuleNotFoundError:
-    import warnings
+    raise ModuleNotFoundError("Jupyter Server must be installed to use this extension.") from None
 
-    warnings.warn("Could not import submodules")
+if int(version_info[0]) < 2:  # type:ignore
+    raise RuntimeError("Jupyter Server Terminals requires Jupyter Server 2.0+")
+
+from .app import TerminalsExtensionApp
 
 
 def _jupyter_server_extension_points():  # pragma: no cover

jupyter_server_terminals/api_handlers.py

@@ -2,17 +2,12 @@
 from pathlib import Path
 from typing import Optional
 
+from jupyter_server.auth.decorator import authorized
+from jupyter_server.base.handlers import APIHandler
 from tornado import web
 
 from .base import TerminalsMixin
 
-try:
-    from jupyter_server.auth.decorator import authorized
-    from jupyter_server.base.handlers import APIHandler
-except ModuleNotFoundError:
-    raise ModuleNotFoundError("Jupyter Server must be installed to use this extension.") from None
-
-
 AUTH_RESOURCE = "terminals"
 
 

jupyter_server_terminals/app.py

@@ -3,18 +3,14 @@
 import sys
 from shutil import which
 
+from jupyter_core.utils import ensure_async
+from jupyter_server.extension.application import ExtensionApp
+from jupyter_server.transutils import trans
 from traitlets import Type
 
 from . import api_handlers, handlers
 from .terminalmanager import TerminalManager
 
-try:
-    from jupyter_core.utils import ensure_async
-    from jupyter_server.extension.application import ExtensionApp
-    from jupyter_server.transutils import trans
-except ModuleNotFoundError:
-    raise ModuleNotFoundError("Jupyter Server must be installed to use this extension.") from None
-
 
 class TerminalsExtensionApp(ExtensionApp):
 

jupyter_server_terminals/base.py

@@ -1,7 +1,4 @@
-try:
-    from jupyter_server.extension.handler import ExtensionHandlerMixin
-except ModuleNotFoundError:
-    raise ModuleNotFoundError("Jupyter Server must be installed to use this extension.") from None
+from jupyter_server.extension.handler import ExtensionHandlerMixin
 
 
 class TerminalsMixin(ExtensionHandlerMixin):

jupyter_server_terminals/handlers.py

@@ -1,19 +1,15 @@
 """Tornado handlers for the terminal emulator."""
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
+from jupyter_server._tz import utcnow
+from jupyter_server.auth.utils import warn_disabled_authorization
+from jupyter_server.base.handlers import JupyterHandler
+from jupyter_server.base.websocket import WebSocketMixin
 from terminado.websocket import TermSocket as BaseTermSocket
 from tornado import web
 
 from .base import TerminalsMixin
 
-try:
-    from jupyter_server._tz import utcnow
-    from jupyter_server.auth.utils import warn_disabled_authorization
-    from jupyter_server.base.handlers import JupyterHandler
-    from jupyter_server.base.websocket import WebSocketMixin
-except ModuleNotFoundError:
-    raise ModuleNotFoundError("Jupyter Server must be installed to use this extension.") from None
-
 AUTH_RESOURCE = "terminals"
 
 

jupyter_server_terminals/terminalmanager.py

@@ -6,20 +6,16 @@
 # Distributed under the terms of the Modified BSD License.
 from datetime import timedelta
 
+from jupyter_server._tz import isoformat, utcnow
+from jupyter_server.prometheus.metrics import (  # type:ignore[attr-defined]
+    TERMINAL_CURRENTLY_RUNNING_TOTAL,
+)
 from terminado.management import NamedTermManager
 from tornado import web
 from tornado.ioloop import IOLoop, PeriodicCallback
 from traitlets import Integer
 from traitlets.config import LoggingConfigurable
 
-try:
-    from jupyter_server._tz import isoformat, utcnow
-    from jupyter_server.prometheus.metrics import (  # type:ignore[attr-defined]
-        TERMINAL_CURRENTLY_RUNNING_TOTAL,
-    )
-except ModuleNotFoundError:
-    raise ModuleNotFoundError("Jupyter Server must be installed to use this extension.") from None
-
 
 class TerminalManager(LoggingConfigurable, NamedTermManager):  # type:ignore[misc]
     """ """

pyproject.toml

@@ -55,13 +55,6 @@ docs = [
 "sphinxcontrib_github_alt",
 "sphinxemoji",
 ]
-lint = [
-  "black[jupyter]>=22.6.0",
-  "mdformat>0.7",
-  "mdformat-gfm>=0.3.5",
-  "ruff>=0.0.156"
-]
-typing = ["mypy>=0.990"]
 
 [tool.hatch.version]
 path = "jupyter_server_terminals/_version.py"
@@ -88,12 +81,19 @@ test = "python -m pytest -vv --cov jupyter_server_terminals --cov-branch --cov-r
 nowarn = "test -W default {args}"
 
 [tool.hatch.envs.typing]
-features = ["typing", "test"]
+features = ["test"]
+dependencies = ["mypy>=0.990"]
 [tool.hatch.envs.typing.scripts]
 test = "mypy --install-types --non-interactive {args:jupyter_server_terminals tests}"
 
 [tool.hatch.envs.lint]
-features = ["lint"]
+dependencies = [
+  "black[jupyter]==22.10.0",
+  "mdformat>0.7",
+  "mdformat-gfm>=0.3.5",
+  "ruff==0.0.181"
+]
+detached = true
 [tool.hatch.envs.lint.scripts]
 style = [
   "ruff {args:.}",
@@ -163,7 +163,7 @@ ignore = [
   # Line too long
   "E501",
   # Relative imports are banned
-  "I252",
+  "TID252",
   # Boolean ... in function definition
   "FBT001", "FBT002",
   # Module level import not at top of file