From e15691ce94fc6a604fad03b6980657ed7bddd2d2 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Mon, 28 Oct 2019 11:07:11 +0100
Subject: [PATCH 1/3] switch base environment to requirements file

and update several dependencies in the process (jupyterlab 1.1, notebook 6.0, etc.)
---
 tljh/installer.py          | 20 ++++----------------
 tljh/requirements-base.txt | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 tljh/requirements-base.txt

diff --git a/tljh/installer.py b/tljh/installer.py
index b64390d..d8b8b63 100644
--- a/tljh/installer.py
+++ b/tljh/installer.py
@@ -272,22 +272,10 @@ def ensure_user_environment(user_requirements_txt_file):
         'conda==' + conda_version
     ])
 
-    conda.ensure_pip_packages(USER_ENV_PREFIX, [
-        # JupyterHub + notebook package are base requirements for user environment
-        'jupyterhub==1.0.0',
-        'notebook==5.7.8',
-        # Install additional notebook frontends!
-        'jupyterlab==1.2.6',
-        'nteract-on-jupyter==2.0.7',
-        # nbgitpuller for easily pulling in Git repositories
-        'nbgitpuller==0.6.1',
-        # nbresuse to show people how much RAM they are using
-        'nbresuse==0.3.0',
-        # Most people consider ipywidgets to be part of the core notebook experience
-        'ipywidgets==7.4.2',
-        # Pin tornado
-        'tornado<6.0',
-    ])
+    conda.ensure_pip_requirements(
+        USER_ENV_PREFIX,
+        os.path.join(HERE, 'requirements-base.txt'),
+    )
 
     if user_requirements_txt_file:
         # FIXME: This currently fails hard, should fail soft and not abort installer
diff --git a/tljh/requirements-base.txt b/tljh/requirements-base.txt
new file mode 100644
index 0000000..ac3454a
--- /dev/null
+++ b/tljh/requirements-base.txt
@@ -0,0 +1,17 @@
+# FIXME: a frozen version of this file should be used
+# pinning only direct dependencies is a recipe for broken environments!
+
+# JupyterHub + notebook package are base requirements for user environment
+jupyterhub==1.0.*
+notebook==6.0.*
+# Install additional notebook frontends!
+jupyterlab==1.1.*
+nteract-on-jupyter==2.1.*
+# nbgitpuller for easily pulling in Git repositories
+nbgitpuller==0.7.*
+# nbresuse to show people how much RAM they are using
+nbresuse==0.3.*
+# Most people consider ipywidgets to be part of the core notebook experience
+ipywidgets==7.5.*
+# Pin tornado
+tornado<6

From 9eb13cb439bacccad6feca64061d3cb4365871e9 Mon Sep 17 00:00:00 2001
From: GeorgianaElena <georgiana.dolocan@gmail.com>
Date: Tue, 21 Jan 2020 21:12:21 +0200
Subject: [PATCH 2/3] bump jupyterlab minor version

---
 tljh/requirements-base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tljh/requirements-base.txt b/tljh/requirements-base.txt
index ac3454a..ea0e45c 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.1.*
+jupyterlab==1.2.*
 nteract-on-jupyter==2.1.*
 # nbgitpuller for easily pulling in Git repositories
 nbgitpuller==0.7.*

From b7478dd03271633a3da45a02f2d92b0ad58d9f1a Mon Sep 17 00:00:00 2001
From: GeorgianaElena <georgiana.dolocan@gmail.com>
Date: Mon, 3 Feb 2020 11:07:49 +0200
Subject: [PATCH 3/3] Update test

---
 integration-tests/test_extensions.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/integration-tests/test_extensions.py b/integration-tests/test_extensions.py
index e071279..347d052 100644
--- a/integration-tests/test_extensions.py
+++ b/integration-tests/test_extensions.py
@@ -13,14 +13,14 @@ def test_serverextensions():
     ], stderr=subprocess.PIPE)
 
     extensions = [
-        'jupyterlab 1.2.6',
-        'nbgitpuller 0.6.1',
-        'nteract_on_jupyter 2.0.7',
+        'jupyterlab 1.2.',
+        'nbgitpuller 0.7.',
+        'nteract_on_jupyter 2.1.',
         'nbresuse '
     ]
 
     for e in extensions:
-        assert '{} \x1b[32mOK\x1b[0m'.format(e) in proc.stderr.decode()
+        assert e in proc.stderr.decode()
 
 def test_nbextensions():
     """