sync with main

tljh/configurer.py

@@ -228,8 +228,6 @@ def update_user_environment(c, config):
     # Set default application users are launched into
     if user_env["default_app"] == "jupyterlab":
         c.Spawner.default_url = "/lab"
-    elif user_env["default_app"] == "nteract":
-        c.Spawner.default_url = "/nteract"
 
 
 def update_user_account_config(c, config):

tljh/installer.py

@@ -123,14 +123,13 @@ def ensure_jupyterhub_package(prefix):
     conda.ensure_pip_packages(
         prefix,
         [
-            "SQLAlchemy<2.0.0",
-            "jupyterhub==1.*",
-            "jupyterhub-systemdspawner==0.16.*",
+            "jupyterhub==3.*",
+            "jupyterhub-systemdspawner==0.17.*",
             "jupyterhub-firstuseauthenticator==1.*",
             "jupyterhub-nativeauthenticator==1.*",
             "jupyterhub-ldapauthenticator==1.*",
             "jupyterhub-tmpauthenticator==0.6.*",
-            "oauthenticator==14.*",
+            "oauthenticator==15.*",
             "jupyterhub-idle-culler==1.*",
             "git+https://github.com/yuvipanda/jupyterhub-configurator@317759e17c8e48de1b1352b836dac2a230536dba",
         ],

tljh/log.py

@@ -9,6 +9,13 @@ def init_logging():
     """Setup default tljh logger"""
     logger = logging.getLogger("tljh")
     os.makedirs(INSTALL_PREFIX, exist_ok=True)
+
+    # check if any log handlers are already registered
+    # don't reconfigure logs if handlers are already configured
+    # e.g. happens in pytest, which hooks up log handlers for reporting
+    # or if this function is called twice
+    if logger.hasHandlers():
+        return
     file_logger = logging.FileHandler(os.path.join(INSTALL_PREFIX, "installer.log"))
     file_logger.setFormatter(logging.Formatter("%(asctime)s %(message)s"))
     logger.addHandler(file_logger)

tljh/requirements-base.txt

@@ -5,20 +5,14 @@
 #          the requirements-txt-fixer pre-commit hook that sorted them and made
 #          our integration tests fail.
 #
-# For JupyterHub 1.x SQLAlchemy below 2.0.0
-SQLAlchemy<2.0.0
 # JupyterHub + notebook package are base requirements for user environment
-jupyterhub==1.*
+jupyterhub==3.*
 notebook==6.*
 # Install additional notebook frontends!
 jupyterlab==3.*
-nteract-on-jupyter==2.*
-# Install jupyterlab extensions from PyPI
 # nbgitpuller for easily pulling in Git repositories
 nbgitpuller==1.*
 # jupyter-resource-usage to show people how much RAM they are using
-jupyter-resource-usage==0.6.*
+jupyter-resource-usage==0.7.*
 # Most people consider ipywidgets to be part of the core notebook experience
-ipywidgets==7.*
-# Pin tornado
-tornado>=6.1
+ipywidgets==8.*