diff --git a/integration-tests/test_extensions.py b/integration-tests/test_extensions.py index 347d052..879dbca 100644 --- a/integration-tests/test_extensions.py +++ b/integration-tests/test_extensions.py @@ -13,7 +13,7 @@ def test_serverextensions(): ], stderr=subprocess.PIPE) extensions = [ - 'jupyterlab 1.2.', + 'jupyterlab 2.', 'nbgitpuller 0.7.', 'nteract_on_jupyter 2.1.', 'nbresuse ' @@ -43,12 +43,3 @@ def test_nbextensions(): # Ensure we have 'OK' messages in our stdout, to make sure everything is importable assert proc.stderr.decode() == ' - Validating: \x1b[32mOK\x1b[0m\n' * len(extensions) - - -def test_labextensions(): - """ - Validate labextensions we want installed - """ - # Currently we only install jupyterhub - assert os.path.exists('/opt/tljh/user/bin/jupyter-labhub') - \ No newline at end of file diff --git a/tljh/installer.py b/tljh/installer.py index 1fed0ff..b18e2ac 100644 --- a/tljh/installer.py +++ b/tljh/installer.py @@ -170,7 +170,9 @@ def ensure_jupyterlab_extensions(): Install the JupyterLab extensions we want. """ extensions = [ - '@jupyter-widgets/jupyterlab-manager@1.1' # for jupyterlab 1.2.x + # We don't pin versions here, since labextension will find something + # appropriate for our version of jupyterlab + '@jupyter-widgets/jupyterlab-manager' ] install_options = [ '--no-build' # do not build extension at install time. Will build later diff --git a/tljh/requirements-base.txt b/tljh/requirements-base.txt index ea0e45c..9312b44 100644 --- a/tljh/requirements-base.txt +++ b/tljh/requirements-base.txt @@ -5,7 +5,7 @@ jupyterhub==1.0.* notebook==6.0.* # Install additional notebook frontends! -jupyterlab==1.2.* +jupyterlab==2.* nteract-on-jupyter==2.1.* # nbgitpuller for easily pulling in Git repositories nbgitpuller==0.7.*