From ed9ba5d35db8885498e77465c70293b84d795b4c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 24 Mar 2020 15:44:15 +0100 Subject: [PATCH 1/5] 2.0.1 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 79d4a05..6b6ba5e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview JupyterLab is the next-generation user interface for Project Jupyter offering all the familiar building blocks of the classic Jupyter Notebook (notebook, terminal, text editor, file browser, rich outputs, etc.) in a flexible and powerful user interface. JupyterLab will eventually replace the classic Jupyter Notebook. -**Shipped version:** v1.2.6 +**Shipped version:** v2.0.1 ## Screenshots diff --git a/manifest.json b/manifest.json index 32ea6da..6019c3e 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "JupyterLab", "id": "jupyterlab", "packaging_format": 1, - "version": "1.2.6~ynh1", + "version": "2.0.1~ynh1", "description": { "en": "An extensible environment for interactive and reproducible computing (notebook, terminal, text editor, file browser, rich outputs, etc.)", "fr": "Un environnement informatique extensible, interactif et reproductible (bloc-notes, terminal, éditeur de texte, explorateur de fichiers, texte enrichi, etc.)" diff --git a/scripts/upgrade.d/upgrade.sh b/scripts/upgrade.d/upgrade.sh index 7a28367..c2ffef4 100644 --- a/scripts/upgrade.d/upgrade.sh +++ b/scripts/upgrade.d/upgrade.sh @@ -1 +1 @@ -jupyterlab_version="1.2.6" +jupyterlab_version="2.0.1" From d8abdf90038bf3eac25b3195332f15ad0c9029e4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 24 Mar 2020 16:12:04 +0100 Subject: [PATCH 2/5] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index d53d870..1a757bb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="python3-pip" +pkg_dependencies="python3-pip libffi-dev" #================================================= # PERSONAL HELPERS From a00c2120c63257d6169909db9b2b5e4b296b7e4c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 24 Mar 2020 16:12:09 +0100 Subject: [PATCH 3/5] Update upgrade --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 121cb5a..8187b58 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -99,7 +99,7 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=8 npm install -g configurable-http-proxy -pip3 install pipenv +python3 -m pip install pipenv #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -116,9 +116,9 @@ then pushd $final_path - PIPENV_VENV_IN_PROJECT="enabled" PIPENV_SKIP_LOCK=true ynh_exec_warn_less pipenv install jupyterlab==$jupyterlab_version jupyterhub notebook jupyterhub-ldapauthenticator --three + PIPENV_VENV_IN_PROJECT="enabled" PIPENV_SKIP_LOCK=true ynh_exec_warn_less python3 -m pipenv install jupyterlab==$jupyterlab_version jupyterhub notebook jupyterhub-ldapauthenticator --three - ynh_exec_warn_less pipenv run jupyterhub upgrade-db + ynh_exec_warn_less python3 -m pipenv run jupyterhub upgrade-db popd fi From 75306d5859d488964cc821aa9ea34f11db8e363e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 24 Mar 2020 16:12:13 +0100 Subject: [PATCH 4/5] Update restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 7411fbf..81c2f9f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -77,7 +77,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_nodejs --nodejs_version=8 -pip3 install pipenv +python3 -m pip install pipenv npm install -g configurable-http-proxy From fb7e88d154f00c225c5215f3ad82a156863f2111 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 24 Mar 2020 16:12:16 +0100 Subject: [PATCH 5/5] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 00e3f52..606feee 100644 --- a/scripts/install +++ b/scripts/install @@ -82,7 +82,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_nodejs --nodejs_version=8 -pip3 install pipenv +python3 -m pip install pipenv npm install -g configurable-http-proxy @@ -99,7 +99,7 @@ mkdir -p $final_path pushd $final_path -PIPENV_VENV_IN_PROJECT="enabled" PIPENV_SKIP_LOCK=true ynh_exec_warn_less pipenv install jupyterlab==$jupyterlab_version jupyterhub notebook jupyterhub-ldapauthenticator --three +PIPENV_VENV_IN_PROJECT="enabled" PIPENV_SKIP_LOCK=true ynh_exec_warn_less python3 -m pipenv install jupyterlab==$jupyterlab_version jupyterhub notebook jupyterhub-ldapauthenticator --three popd