From f2952ff03019898cd57e9a482e8822aa36e41cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?= Date: Thu, 10 Oct 2024 16:31:36 -0400 Subject: [PATCH 1/3] Update to JupyterHub 5.2.0 --- data/common.yaml | 2 +- templates/hub-requirements.txt.epp | 17 ++++++++++++++++- templates/node-requirements.txt.epp | 29 +++++++++++++++++++++-------- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/data/common.yaml b/data/common.yaml index 1a04910..8e5cc69 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -1,7 +1,7 @@ # jupyterhub/data/common.yaml --- jupyterhub::notebook::version: 6.4.12 -jupyterhub::jupyterhub::version: 4.1.6 +jupyterhub::jupyterhub::version: 5.2.0 jupyterhub::pamela::version: 1.1.0 jupyterhub::batchspawner::version: 1.3.0 diff --git a/templates/hub-requirements.txt.epp b/templates/hub-requirements.txt.epp index 81cbb0c..29cc82b 100644 --- a/templates/hub-requirements.txt.epp +++ b/templates/hub-requirements.txt.epp @@ -7,6 +7,8 @@ jupyterhub-traefik-proxy==<%= $jupyterhub_traefik_proxy_version %> aiohttp==3.8.5 aiosignal==1.3.1 alembic==1.9.2 +annotated-types==0.7.0 +arrow==1.3.0 async-generator==1.10 async-timeout==4.0.3 attrs==22.2.0 @@ -19,12 +21,16 @@ charset-normalizer==3.0.1 cryptography==39.0.0 entrypoints==0.4 escapism==1.0.1 +fqdn==1.5.1 frozenlist==1.4.0 greenlet==2.0.2 html-sanitizer==1.9.3 idna==3.4 +isoduration==20.11.0 Jinja2==3.1.2 +jsonpointer==3.0.0 jsonschema==4.18.0 +jupyter-events==0.10.0 jupyter-telemetry==0.1.0 lxml==4.9.2 Mako==1.2.4 @@ -35,19 +41,28 @@ packaging==23.0 passlib==1.7.4 prometheus-client==0.16.0 pycparser==2.21 +pydantic-core==2.23.4 +pydantic==2.9.2 pyOpenSSL==23.0.0 pyrsistent==0.19.3 python-dateutil==2.8.2 python-json-logger==2.0.4 +pyyaml==6.0.2 requests==2.28.2 -ruamel.yaml==0.17.21 +rfc3339-validator==0.1.4 +rfc3986-validator==0.1.1 ruamel.yaml.clib==0.2.7 +ruamel.yaml==0.17.21 six==1.16.0 soupsieve==2.3.2.post1 SQLAlchemy==1.4.46 toml==0.10.2 tornado==6.2 traitlets==5.9.0 +types-python-dateutil==2.9.0.20241003 +typing-extensions==4.12.2 +uri-template==1.3.0 urllib3==1.26.14 +webcolors==24.8.0 WTForms==2.3.1 yarl==1.9.2 diff --git a/templates/node-requirements.txt.epp b/templates/node-requirements.txt.epp index 12b4f0a..544ba6d 100644 --- a/templates/node-requirements.txt.epp +++ b/templates/node-requirements.txt.epp @@ -12,9 +12,11 @@ notebook==<%= $notebook_version %> aiohttp==3.8.3 aiosignal==1.3.1 alembic==1.9.2 +annotated-types==0.7.0 anyio==3.6.2 -argon2-cffi==21.3.0 argon2-cffi-bindings==21.2.0 +argon2-cffi==21.3.0 +arrow==1.3.0 asttokens==2.2.1 async-generator==1.10 async-timeout==4.0.2 @@ -35,21 +37,25 @@ defusedxml==0.7.1 entrypoints==0.4 executing==1.2.0 fastjsonschema==2.16.2 +fqdn==1.5.1 frozenlist==1.3.3 greenlet==2.0.2 idna==3.4 importlib-metadata==6.0.0 ipython-genutils==0.2.0 +isoduration==20.11.0 Jinja2==3.1.2 json5==0.9.11 -jsonschema==4.18.0 +jsonpointer==3.0.0 jsonschema-specifications==2024.10.1 -jupyter-server==1.23.5 -jupyter-telemetry==0.1.0 +jsonschema==4.18.0 jupyter_client==8.0.2 jupyter_core==5.2.0 -jupyterlab-pygments==0.2.2 +jupyter-events==0.10.0 +jupyter-server==1.23.5 +jupyter-telemetry==0.1.0 jupyterlab_server==2.19.0 +jupyterlab-pygments==0.2.2 Mako==1.2.4 MarkupSafe==2.1.2 matplotlib-inline==0.1.6 @@ -64,7 +70,7 @@ notebook_shim==0.2.2 numpy==1.24.1 oauthlib==3.2.2 packaging==23.0 -pamela==1.0.0 +pamela==1.2.0 pandas==1.5.3 pandocfilters==1.5.0 Pillow==9.4.0 @@ -74,6 +80,8 @@ psutil==5.9.4 ptyprocess==0.7.0 pure-eval==0.2.2 pycparser==2.21 +pydantic-core==2.23.4 +pydantic==2.9.2 Pygments==2.14.0 pynvml==11.4.1 pyOpenSSL==23.0.0 @@ -85,9 +93,11 @@ PyYAML==6.0 pyzmq==25.0.0 referencing==0.35.1 requests==2.28.2 +rfc3339-validator==0.1.4 +rfc3986-validator==0.1.1 rpds-py==0.20.0 -ruamel.yaml==0.17.21 ruamel.yaml.clib==0.2.7 +ruamel.yaml==0.17.21 Send2Trash==1.8.0 simpervisor==0.4 six==1.16.0 @@ -100,8 +110,11 @@ tinycss2==1.2.1 tomli==2.0.1 tornado==6.2 traitlets==5.9.0 -typing_extensions==4.4.0 +types-python-dateutil==2.9.0.20241003 +typing-extensions==4.12.2 +uri-template==1.3.0 urllib3==1.26.14 +webcolors==24.8.0 webencodings==0.5.1 websocket-client==1.5.0 xyzservices==2022.9.0 From 2ab981e0bd86402deadb8a48cb4bd4ad89ee63e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?= Date: Thu, 10 Oct 2024 16:36:37 -0400 Subject: [PATCH 2/3] Add allow_all to authenticator --- manifests/init.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/init.pp b/manifests/init.pp index e4b5794..1e3c8db 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -221,6 +221,7 @@ }, 'Authenticator' => { 'admin_groups' => $admin_groups, + 'allow_all' => true, 'blocked_users' => $blocked_users, 'auto_login' => $authenticator ? { 'OIDC' => true, From 97e8d6ed1e762f94a0f793a09d9cd917d2f3a818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix-Antoine=20Fortin?= Date: Thu, 10 Oct 2024 16:53:37 -0400 Subject: [PATCH 3/3] Bump pamela version --- data/common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/common.yaml b/data/common.yaml index 8e5cc69..c3c415b 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -2,7 +2,7 @@ --- jupyterhub::notebook::version: 6.4.12 jupyterhub::jupyterhub::version: 5.2.0 -jupyterhub::pamela::version: 1.1.0 +jupyterhub::pamela::version: 1.2.0 jupyterhub::batchspawner::version: 1.3.0 jupyterhub::slurmformspawner::version: 2.6.0