From 516a23e377321ae62e6cb4ba79904202dcfbf61d Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Wed, 23 Dec 2020 13:53:57 +0200 Subject: [PATCH 1/3] Bump jh in hub env --- tljh/installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tljh/installer.py b/tljh/installer.py index 7c4b78c..c3ea99e 100644 --- a/tljh/installer.py +++ b/tljh/installer.py @@ -222,7 +222,7 @@ def ensure_jupyterhub_package(prefix): conda.ensure_pip_packages( prefix, [ - "jupyterhub==1.1.0", + "jupyterhub==1.2.0", "jupyterhub-dummyauthenticator==0.3.1", "jupyterhub-systemdspawner==0.15", "jupyterhub-firstuseauthenticator==0.14.1", From 11b872943bbc4179f6d7ddeb76d2fa3a06334a6a Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Wed, 23 Dec 2020 14:01:01 +0200 Subject: [PATCH 2/3] Pin chardet in hub env --- tljh/installer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tljh/installer.py b/tljh/installer.py index c3ea99e..f3cc989 100644 --- a/tljh/installer.py +++ b/tljh/installer.py @@ -222,7 +222,7 @@ def ensure_jupyterhub_package(prefix): conda.ensure_pip_packages( prefix, [ - "jupyterhub==1.2.0", + "jupyterhub==1.2.2", "jupyterhub-dummyauthenticator==0.3.1", "jupyterhub-systemdspawner==0.15", "jupyterhub-firstuseauthenticator==0.14.1", @@ -231,6 +231,7 @@ def ensure_jupyterhub_package(prefix): "jupyterhub-tmpauthenticator==0.6", "oauthenticator==0.10.0", "jupyterhub-idle-culler==1.0", + "chardet==3.0.4", ], ) traefik.ensure_traefik_binary(prefix) From 678fa3adfadaff0260f292654a20f7f2a077b911 Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Wed, 23 Dec 2020 18:02:45 +0200 Subject: [PATCH 3/3] Update proxy test for latest jh version --- integration-tests/test_proxy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/test_proxy.py b/integration-tests/test_proxy.py index 390dd6a..be91d78 100644 --- a/integration-tests/test_proxy.py +++ b/integration-tests/test_proxy.py @@ -165,7 +165,7 @@ def test_extra_traefik_config(): # test extra dynamic config resp = send_request(url="http://127.0.0.1/the/hub/runs/here/too", max_sleep=5) assert resp.code == 200 - assert resp.effective_url == "http://127.0.0.1/hub/login" + assert "http://127.0.0.1/hub/login" in resp.effective_url # cleanup os.remove(os.path.join(extra_static_config_dir, "extra.toml"))