Merge pull request cylc#589 from cylc/1.4.x-sync

🤖 Merge 1.4.x-sync into master

cylc/uiserver/handlers.py

@@ -187,7 +187,7 @@ def initialize(self, *args, **kwargs):
     @web.authenticated
     def get(self, path):
         # authenticate the static handler
-        # this provides us with login redirection and token cashing
+        # this provides us with login redirection and token caching
         return web.StaticFileHandler.get(self, path)
 
 

cylc/uiserver/scripts/hub.py

@@ -18,8 +18,6 @@
 """
 
 import os
-import sys
-from unittest.mock import patch
 from pathlib import Path
 
 from jupyterhub.app import JupyterHub
@@ -40,14 +38,6 @@ def main(*args):
     # set an env var flag to help load the config
     os.environ['CYLC_HUB_VERSION'] = __version__
     try:
-        # JupyterHub 3.0.0 incorrectly passes our config file path as second
-        # arg of Tornado run_sync, which is supposed to be a timeout value.
-        #   https://github.com/jupyterhub/jupyterhub/pull/4039
-        # Reviewer: "Will do a 3.0.1 pretty soon after some more 3.0 feedback."
-        # TODO: once we depend on jupyter >= 3.0.1 can revert to this:
-        #   JupyterHub.launch_instance(args)
-        with patch.object(sys, "argv", [sys.argv[0]] + list(args)):
-            # Patch works via traitlets.config.Application.parse_command_line
-            JupyterHub.launch_instance()
+        JupyterHub.launch_instance(args)
     finally:
         del os.environ['CYLC_HUB_VERSION']

setup.cfg

@@ -100,7 +100,8 @@ tests =
     mypy>=0.900
     pytest-cov>=2.8.0
     pytest-tornasync>=0.5.0
-    pytest>=6
+    # https://github.com/pytest-dev/pytest/issues/12263
+    pytest>=6,<8.2
     towncrier>=23
     types-pkg_resources>=0.1.2
     types-requests>2