From 5bbc06718099f65a3421283a1dde46a64e300dc6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 21 Apr 2020 13:28:13 +0200 Subject: [PATCH 01/14] update node to 12 --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 606feee..73c1602 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,7 @@ ynh_script_progression --message="Installing dependencies..." --weight=23 ynh_install_app_dependencies $pkg_dependencies -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=8 +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=12 python3 -m pip install pipenv From 250a10f4f080a60e295ab8ca0b42cdbbbf9d918e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 21 Apr 2020 21:09:18 +0200 Subject: [PATCH 02/14] update upgrade to nodejs v.12 --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8187b58..76feb9c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -95,7 +95,7 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=83 ynh_install_app_dependencies $pkg_dependencies -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=8 +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=12 npm install -g configurable-http-proxy From f38707fd1d79ee2a41b5b96eebf184946386be29 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 21 Apr 2020 21:10:44 +0200 Subject: [PATCH 03/14] update restore to nodejs v.12 --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 81c2f9f..84b828e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -75,7 +75,7 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=75 # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=8 +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=12 python3 -m pip install pipenv From 8993e5a4ac95191fca9fa10617261a4ff0cf8867 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 21 Apr 2020 23:05:24 +0200 Subject: [PATCH 04/14] set permission to virtualenv folder --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 606feee..8603af2 100644 --- a/scripts/install +++ b/scripts/install @@ -160,8 +160,8 @@ ynh_store_file_checksum --file="$final_path/config/jupyter_notebook_config.py" #================================================= # Set permissions to app files -chown -R root: $final_path -chown -R $admin: $final_path/.venv/share +chown -R $admin: $final_path/ +chmod -R 755 $final_path/.venv/ #================================================= # ADVERTISE SERVICE IN ADMIN PANEL From 2f9da9a22a90fb765e2d42fb12728d55eb744e90 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 22 Apr 2020 16:14:53 +0200 Subject: [PATCH 05/14] revert to nodejs 10 --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 73c1602..5243596 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,7 @@ ynh_script_progression --message="Installing dependencies..." --weight=23 ynh_install_app_dependencies $pkg_dependencies -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=12 +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=10 python3 -m pip install pipenv diff --git a/scripts/restore b/scripts/restore index 84b828e..fa5a800 100644 --- a/scripts/restore +++ b/scripts/restore @@ -75,7 +75,7 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=75 # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=12 +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=10 python3 -m pip install pipenv diff --git a/scripts/upgrade b/scripts/upgrade index 76feb9c..8767b76 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -95,7 +95,7 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=83 ynh_install_app_dependencies $pkg_dependencies -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=12 +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=10 npm install -g configurable-http-proxy From d442160f55a5d1adbc8b25343be730c6b6ed3584 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 22 Apr 2020 18:20:01 +0200 Subject: [PATCH 06/14] set permission to virtualenv folder --- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/restore b/scripts/restore index 81c2f9f..815b937 100644 --- a/scripts/restore +++ b/scripts/restore @@ -62,8 +62,8 @@ ynh_restore_file --origin_path="$final_path" #================================================= # Restore permissions on app files -chown -R root: $final_path -chown -R $admin: $final_path/.venv/share +chown -R $admin: $final_path/ +chmod -R 755 $final_path/.venv/ #================================================= # SPECIFIC RESTORATION diff --git a/scripts/upgrade b/scripts/upgrade index 8187b58..800d116 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -170,8 +170,8 @@ ynh_add_systemd_config #================================================= # Set permissions on app files -chown -R root: $final_path -chown -R $admin: $final_path/.venv/share +chown -R $admin: $final_path/ +chmod -R 755 $final_path/.venv/ #================================================= # SETUP SSOWAT From d9832a8f533b9021006c1d67cf62fc1a017722e3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 24 Apr 2020 11:15:29 +0200 Subject: [PATCH 07/14] creat nodejs variable in common.sh --- scripts/_common.sh | 2 ++ scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1a757bb..a0d2a8c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,6 +7,8 @@ # dependencies used by the app pkg_dependencies="python3-pip libffi-dev" +nodejs_version=10 + #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 5243596..a404732 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,7 @@ ynh_script_progression --message="Installing dependencies..." --weight=23 ynh_install_app_dependencies $pkg_dependencies -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=10 +ynh_exec_warn_less ynh_install_nodejs $nodejs_version python3 -m pip install pipenv diff --git a/scripts/restore b/scripts/restore index fa5a800..726b9ad 100644 --- a/scripts/restore +++ b/scripts/restore @@ -75,7 +75,7 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=75 # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=10 +ynh_exec_warn_less ynh_install_nodejs $nodejs_version python3 -m pip install pipenv diff --git a/scripts/upgrade b/scripts/upgrade index 8767b76..65597ec 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -95,7 +95,7 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=83 ynh_install_app_dependencies $pkg_dependencies -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=10 +ynh_exec_warn_less ynh_install_nodejs $nodejs_version npm install -g configurable-http-proxy From e32abf96d4d13a54facc49b8ff46b11320473929 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 24 Apr 2020 16:56:44 +0200 Subject: [PATCH 08/14] update to v.2.1.1 --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/upgrade.d/upgrade.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6c1b610..0c8b706 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,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:** 2.1.0 +**Shipped version:** 2.1.1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index d51b062..69a3734 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble JupyterLab est une interface utilisateur de nouvelle génération pour le projet Jupyter offrant tous les modules de Jupyter Notebook (interpréteur Python, terminal, éditeur de texte, navigateur de fichiers, etc.) dans une interface utilisateur flexible et puissante. JupyterLab remplacera à terme Jupyter Notebook. -**Version incluse:** 2.1.0 +**Version incluse:** 2.1.1 ## Captures d'écran diff --git a/manifest.json b/manifest.json index 3dffee3..69c4a41 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "JupyterLab", "id": "jupyterlab", "packaging_format": 1, - "version": "2.1.0~ynh2", + "version": "2.1.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 31d53da..4f92d7d 100644 --- a/scripts/upgrade.d/upgrade.sh +++ b/scripts/upgrade.d/upgrade.sh @@ -1 +1 @@ -jupyterlab_version="2.1.0" +jupyterlab_version="2.1.1" From 8ddd9d7191a52c3b7f4bf7248b228c34d3d3b794 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 25 Apr 2020 14:02:50 +0200 Subject: [PATCH 09/14] Fix typos --- README.md | 4 ++-- README_fr.md | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 0c8b706..14002e1 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # JupyterLab for YunoHost [![Integration level](https://dash.yunohost.org/integration/jupyterlab.svg)](https://dash.yunohost.org/appci/app/jupyterlab) ![](https://ci-apps.yunohost.org/ci/badges/jupyterlab.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/jupyterlab.maintain.svg) -[![Install jupyterlab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=jupyterlab) +[![Install jupyterLab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=jupyterlab) *[Lire ce readme en français.](./README_fr.md)* -> *This package allow you to install Jupyterlab quickly and simply on a YunoHost server. +> *This package allow you to install JupyterLab quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* ## Overview diff --git a/README_fr.md b/README_fr.md index 69a3734..154137e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,19 +1,19 @@ # JupyterLab pour YunoHost [![Integration level](https://dash.yunohost.org/integration/jupyterlab.svg)](https://dash.yunohost.org/appci/app/jupyterlab) ![](https://ci-apps.yunohost.org/ci/badges/jupyterlab.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/jupyterlab.maintain.svg) -[![Install jupyterlab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=jupyterlab) +[![Install jupyterLab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=jupyterlab) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Jupyterlab rapidement et simplement sur un serveur Yunohost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer JupyterLab rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble JupyterLab est une interface utilisateur de nouvelle génération pour le projet Jupyter offrant tous les modules de Jupyter Notebook (interpréteur Python, terminal, éditeur de texte, navigateur de fichiers, etc.) dans une interface utilisateur flexible et puissante. JupyterLab remplacera à terme Jupyter Notebook. -**Version incluse:** 2.1.1 +**Version incluse :** 2.1.1 -## Captures d'écran +## Captures d’écran ![](https://raw.githubusercontent.com/jupyterlab/jupyterlab/3e3a2c9e295703ff6d441589423e284cc6d5c245/docs/source/images/jupyterlab.png) @@ -23,18 +23,18 @@ JupyterLab est une interface utilisateur de nouvelle génération pour le projet ## Configuration -Comment configurer cette application: via le panneau d'administration, un fichier brut en SSH. +Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH. ## Documentation -* Documentation officielle: [Lien vers la documentation officielle de cette application](https://jupyterlab.readthedocs.io/en/stable/) +* Documentation officielle : [Lien vers la documentation officielle de cette application](https://jupyterlab.readthedocs.io/en/stable/) ## Caractéristiques spécifiques YunoHost #### Support multi-utilisateurs -* L'authentification LDAP est-elle prise en charge? **Oui** -* L'application peut-elle être utilisée par plusieurs utilisateurs? **Oui** +* L’authentification LDAP est-elle prise en charge ? **Oui** +* L’application peut-elle être utilisée par plusieurs utilisateurs ? **Oui** #### Architectures supportées @@ -43,9 +43,9 @@ Comment configurer cette application: via le panneau d'administration, un fichie ## Liens -* Signaler un bug: https://github.com/YunoHost-Apps/jupyterlab_ynh/issues -* Site de l'application: https://jupyter.org/index.html -* Site web YunoHost: https://yunohost.org/ +* Signaler un bug : https://github.com/YunoHost-Apps/jupyterlab_ynh/issues +* Site de l’application : https://jupyter.org/index.html +* Site web YunoHost : https://yunohost.org/ --- From 65572d2f23de71849e9df075e04a180182800fdd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 25 Apr 2020 17:29:47 +0200 Subject: [PATCH 10/14] prevent pipenv to erase env --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 800d116..d36b487 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -116,7 +116,7 @@ then pushd $final_path - 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 + PIPENV_VENV_IN_PROJECT="enabled" PIPENV_SKIP_LOCK=true ynh_exec_warn_less python3 -m pipenv install jupyterlab==$jupyterlab_version jupyterhub notebook jupyterhub-ldapauthenticator ynh_exec_warn_less python3 -m pipenv run jupyterhub upgrade-db From 5680f773128d5b6a076e41e466e4dd60994a4bcc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 27 Apr 2020 13:22:30 +0200 Subject: [PATCH 11/14] add getopts --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index a404732..a5157d5 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,7 @@ ynh_script_progression --message="Installing dependencies..." --weight=23 ynh_install_app_dependencies $pkg_dependencies -ynh_exec_warn_less ynh_install_nodejs $nodejs_version +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version python3 -m pip install pipenv diff --git a/scripts/restore b/scripts/restore index 726b9ad..e468a0b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -75,7 +75,7 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=75 # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies -ynh_exec_warn_less ynh_install_nodejs $nodejs_version +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version python3 -m pip install pipenv diff --git a/scripts/upgrade b/scripts/upgrade index 65597ec..1fba3d8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -95,7 +95,7 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=83 ynh_install_app_dependencies $pkg_dependencies -ynh_exec_warn_less ynh_install_nodejs $nodejs_version +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version npm install -g configurable-http-proxy From 4d5b3a1a1819fbb6e95923165fc6298339df4270 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 27 Apr 2020 17:13:41 +0200 Subject: [PATCH 12/14] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 8603af2..3a907b4 100644 --- a/scripts/install +++ b/scripts/install @@ -160,8 +160,8 @@ ynh_store_file_checksum --file="$final_path/config/jupyter_notebook_config.py" #================================================= # Set permissions to app files -chown -R $admin: $final_path/ -chmod -R 755 $final_path/.venv/ +chown -R root: $final_path/ +chown -R $admin: $final_path/.venv/lib #================================================= # ADVERTISE SERVICE IN ADMIN PANEL From f230b12eae83bb61c95d8dff526d45e0ca3b204d Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 28 Apr 2020 19:43:29 +0200 Subject: [PATCH 13/14] Fix permissions --- scripts/install | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index d84d915..ab70caf 100644 --- a/scripts/install +++ b/scripts/install @@ -161,7 +161,7 @@ ynh_store_file_checksum --file="$final_path/config/jupyter_notebook_config.py" # Set permissions to app files chown -R root: $final_path/ -chown -R $admin: $final_path/.venv/lib +chown -R $admin: $final_path/.venv/ #================================================= # ADVERTISE SERVICE IN ADMIN PANEL diff --git a/scripts/restore b/scripts/restore index c523967..38823a0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -62,8 +62,8 @@ ynh_restore_file --origin_path="$final_path" #================================================= # Restore permissions on app files -chown -R $admin: $final_path/ -chmod -R 755 $final_path/.venv/ +chown -R root: $final_path/ +chown -R $admin: $final_path/.venv/ #================================================= # SPECIFIC RESTORATION diff --git a/scripts/upgrade b/scripts/upgrade index 826461e..544245a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -170,8 +170,8 @@ ynh_add_systemd_config #================================================= # Set permissions on app files -chown -R $admin: $final_path/ -chmod -R 755 $final_path/.venv/ +chown -R root: $final_path/ +chown -R $admin: $final_path/.venv/ #================================================= # SETUP SSOWAT From 4bd5671691811231fc77db9aa38689224f35d3e6 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 28 Apr 2020 19:44:03 +0200 Subject: [PATCH 14/14] Use _common.sh to specify jupyterlab version --- scripts/_common.sh | 4 +++- scripts/install | 2 -- scripts/upgrade | 2 -- scripts/upgrade.d/upgrade.sh | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 scripts/upgrade.d/upgrade.sh diff --git a/scripts/_common.sh b/scripts/_common.sh index a0d2a8c..51dac8e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,9 @@ # dependencies used by the app pkg_dependencies="python3-pip libffi-dev" -nodejs_version=10 +nodejs_version="10" + +jupyterlab_version="2.1.1" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index ab70caf..56447ad 100644 --- a/scripts/install +++ b/scripts/install @@ -93,8 +93,6 @@ ynh_script_progression --message="Setting up source files..." --weight=64 ynh_app_setting_set --app=$app --key=final_path --value=$final_path -source ./upgrade.d/upgrade.sh - mkdir -p $final_path pushd $final_path diff --git a/scripts/upgrade b/scripts/upgrade index 544245a..862539d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -110,8 +110,6 @@ then ynh_script_progression --message="Upgrading source files..." --weight=160 # Download, check integrity, uncompress and patch the source from app.src - source ./upgrade.d/upgrade.sh - mkdir -p $final_path pushd $final_path diff --git a/scripts/upgrade.d/upgrade.sh b/scripts/upgrade.d/upgrade.sh deleted file mode 100644 index 4f92d7d..0000000 --- a/scripts/upgrade.d/upgrade.sh +++ /dev/null @@ -1 +0,0 @@ -jupyterlab_version="2.1.1"