From 09c74f0584538acd3407a5a3e8b2c37f3a27a04b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 1 Jun 2020 17:47:02 +0200 Subject: [PATCH 01/11] update to v.2.1.4 --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/_common.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e939370..56ced48 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.3 +**Shipped version:** 2.1.4 ## Screenshots diff --git a/README_fr.md b/README_fr.md index b726227..d641887 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) po ## 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.3 +**Version incluse :** 2.1.4 ## Captures d’écran diff --git a/manifest.json b/manifest.json index 124facd..f27235e 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "JupyterLab", "id": "jupyterlab", "packaging_format": 1, - "version": "2.1.3~ynh1", + "version": "2.1.4~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/_common.sh b/scripts/_common.sh index f280770..e4ce68f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="python3-pip libffi-dev" nodejs_version="10" -jupyterlab_version="2.1.3" +jupyterlab_version="2.1.4" #================================================= # PERSONAL HELPERS From da4bac22d9e0f4f6b13edd04ec485bd0d2cec06b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 12 Jun 2020 23:11:45 +0200 Subject: [PATCH 02/11] small typos --- README.md | 5 +++-- README_fr.md | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 56ced48..8fb99a3 100644 --- a/README.md +++ b/README.md @@ -38,13 +38,14 @@ How to configure this app: by an admin panel, a plain file with SSH. #### Supported architectures -* x86-64b - [![](https://ci-apps.yunohost.org/ci/logs/jupyterlab%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/jupyterlab/) +* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/jupyterlab%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/jupyterlab/) * ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/jupyterlab%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jupyterlab/) ## Links * Report a bug: https://github.com/YunoHost-Apps/jupyterlab_ynh/issues -* App website: https://jupyter.org/index.html +* App website: https://jupyter.org +* Upstream app repository: https://github.com/jupyterhub/jupyterhub * YunoHost website: https://yunohost.org/ --- diff --git a/README_fr.md b/README_fr.md index d641887..c5b5248 100644 --- a/README_fr.md +++ b/README_fr.md @@ -38,13 +38,14 @@ Comment configurer cette application : via le panneau d'administration, un fichi #### Architectures supportées -* x86-64b - [![](https://ci-apps.yunohost.org/ci/logs/jupyterlab%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/jupyterlab/) +* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/jupyterlab%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/jupyterlab/) * ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/jupyterlab%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jupyterlab/) ## Liens * Signaler un bug : https://github.com/YunoHost-Apps/jupyterlab_ynh/issues -* Site de l’application : https://jupyter.org/index.html +* Site de l’application : https://jupyter.org +* Dépôt de l’application principale : https://github.com/jupyterhub/jupyterhub * Site web YunoHost : https://yunohost.org/ --- @@ -57,6 +58,6 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno Pour essayer la branche testing, procédez comme suit. ``` sudo yunohost app install https://github.com/YunoHost-Apps/jupyterlab_ynh/tree/testing --debug -or +ou sudo yunohost app upgrade jupyterlab -u https://github.com/YunoHost-Apps/jupyterlab_ynh/tree/testing --debug ``` From 4f35517ec21631fb78c11c2a0044bd583f9de166 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 13 Jun 2020 17:41:10 +0200 Subject: [PATCH 03/11] fix badges --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8fb99a3..9448fae 100644 --- a/README.md +++ b/README.md @@ -38,8 +38,8 @@ How to configure this app: by an admin panel, a plain file with SSH. #### Supported architectures -* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/jupyterlab%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/jupyterlab/) -* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/jupyterlab%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jupyterlab/) +* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/jupyterlab%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/jupyterlab/) +* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/jupyterlab%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jupyterlab/) ## Links diff --git a/README_fr.md b/README_fr.md index c5b5248..c9d75b4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -38,8 +38,8 @@ Comment configurer cette application : via le panneau d'administration, un fichi #### Architectures supportées -* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/jupyterlab%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/jupyterlab/) -* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/jupyterlab%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jupyterlab/) +* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/jupyterlab%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/jupyterlab/) +* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/jupyterlab%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jupyterlab/) ## Liens From 08982b89b2440eba90b40f1c02844fc65bd5b1bb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 13 Jun 2020 17:55:09 +0200 Subject: [PATCH 04/11] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9448fae..7bd2458 100644 --- a/README.md +++ b/README.md @@ -38,8 +38,8 @@ How to configure this app: by an admin panel, a plain file with SSH. #### Supported architectures -* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/jupyterlab%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/jupyterlab/) -* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/jupyterlab%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jupyterlab/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/jupyterlab%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/jupyterlab/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/jupyterlab%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jupyterlab/) ## Links From 2cbb8ddb258ce18aed4bf7901703997fe449397e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 13 Jun 2020 17:55:25 +0200 Subject: [PATCH 05/11] Update README_fr.md --- README_fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README_fr.md b/README_fr.md index c9d75b4..9e6b551 100644 --- a/README_fr.md +++ b/README_fr.md @@ -38,8 +38,8 @@ Comment configurer cette application : via le panneau d'administration, un fichi #### Architectures supportées -* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/jupyterlab%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/jupyterlab/) -* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/jupyterlab%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jupyterlab/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/jupyterlab%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/jupyterlab/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/jupyterlab%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jupyterlab/) ## Liens From 326f20757060594f3f75b418d8b5e80aa916ef83 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Jun 2020 23:32:21 +0200 Subject: [PATCH 06/11] fix unbound variable --- scripts/backup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/backup b/scripts/backup index 57ab2c4..d63f3d4 100644 --- a/scripts/backup +++ b/scripts/backup @@ -23,7 +23,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_print_info --message="Backing up $app..." +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME From f6fe2b9132a8a32967e5186ab3f2727e286e5bbc Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 22 Jun 2020 10:52:58 +0200 Subject: [PATCH 07/11] install pyzmq --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 56447ad..a0b30fe 100644 --- a/scripts/install +++ b/scripts/install @@ -97,7 +97,7 @@ mkdir -p $final_path 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 pyzmq --three popd diff --git a/scripts/upgrade b/scripts/upgrade index 862539d..3d92a49 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -114,7 +114,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 + PIPENV_VENV_IN_PROJECT="enabled" PIPENV_SKIP_LOCK=true ynh_exec_warn_less python3 -m pipenv install jupyterlab==$jupyterlab_version jupyterhub notebook jupyterhub-ldapauthenticator pyzmq ynh_exec_warn_less python3 -m pipenv run jupyterhub upgrade-db From a1caf0f1c736a28cb905740f97c9ad2137d1e166 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 22 Jun 2020 12:01:38 +0200 Subject: [PATCH 08/11] add libzmq3-dev --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index e4ce68f..b9ece47 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="python3-pip libffi-dev" +pkg_dependencies="python3-pip libffi-dev libzmq3-dev" nodejs_version="10" From 62f5619ad14ff1d04019c55e81f1e73a41ee7176 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 22 Jun 2020 14:31:44 +0200 Subject: [PATCH 09/11] add python3-dev --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index b9ece47..152ab13 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="python3-pip libffi-dev libzmq3-dev" +pkg_dependencies="python3-dev python3-pip libffi-dev libzmq3-dev" nodejs_version="10" From 53012fdde50b5ba3575b7f7c08cd714bdace49f3 Mon Sep 17 00:00:00 2001 From: Kayou Date: Mon, 22 Jun 2020 19:01:28 +0200 Subject: [PATCH 10/11] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index f27235e..a7a68d0 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "JupyterLab", "id": "jupyterlab", "packaging_format": 1, - "version": "2.1.4~ynh1", + "version": "2.1.4~ynh2", "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.)" From c982b043d9f034a67a2eb98b49fffc215c27cea1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 23 Jun 2020 08:19:26 +0200 Subject: [PATCH 11/11] update to v.2.1.5 --- README.md | 4 ++-- README_fr.md | 4 ++-- conf/systemd.service | 2 +- manifest.json | 2 +- scripts/_common.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 7bd2458..d328437 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # 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)* @@ -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.4 +**Shipped version:** 2.1.5 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 9e6b551..232b415 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # 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)* @@ -11,7 +11,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## 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.4 +**Version incluse :** 2.1.5 ## Captures d’écran diff --git a/conf/systemd.service b/conf/systemd.service index d2fc315..c10f8f0 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=Jupyterlab +Description=JupyterLab After=syslog.target network.target [Service] diff --git a/manifest.json b/manifest.json index a7a68d0..15e8e2c 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "JupyterLab", "id": "jupyterlab", "packaging_format": 1, - "version": "2.1.4~ynh2", + "version": "2.1.5~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/_common.sh b/scripts/_common.sh index 152ab13..a76d9c9 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="python3-dev python3-pip libffi-dev libzmq3-dev" nodejs_version="10" -jupyterlab_version="2.1.4" +jupyterlab_version="2.1.5" #================================================= # PERSONAL HELPERS