From d6923c61acee6ae407055857b4cfc642460c021f Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 7 Aug 2022 20:24:39 +0200 Subject: [PATCH 01/11] =?UTF-8?q?[autopatch]=20Add=20Common=20Platform?= =?UTF-8?q?=C2=A0Enumeration=20id=20to=20`manifest.json`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index e49d014..52891af 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,8 @@ "website": "https://jupyterlab.readthedocs.io/en/stable/", "demo": "https://mybinder.org/v2/gh/jupyterlab/jupyterlab-demo/master?urlpath=lab/tree/demo", "admindoc": "https://jupyterlab.readthedocs.io/en/stable/", - "code": "https://github.com/jupyterhub/jupyterhub" + "code": "https://github.com/jupyterhub/jupyterhub", + "cpe": "cpe:2.3:a:jupyter:nbdime-jupyterlab" }, "license": "BSD-3-Clause", "maintainer": { @@ -59,4 +60,4 @@ } ] } -} +} \ No newline at end of file From 21cb21e61791694cc5061a6e8f129fdf0c091bba Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 7 Aug 2022 19:09:34 +0000 Subject: [PATCH 02/11] Auto-update README --- README.md | 19 ++++++++++--------- README_fr.md | 25 +++++++++++++++---------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 43d5e4e..9768bc4 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # 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) +[![Integration level](https://dash.yunohost.org/integration/jupyterlab.svg)](https://dash.yunohost.org/appci/app/jupyterlab) ![Working status](https://ci-apps.yunohost.org/ci/badges/jupyterlab.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/jupyterlab.maintain.svg) [![Install JupyterLab with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=jupyterlab) *[Lire ce readme en français.](./README_fr.md)* @@ -24,25 +24,26 @@ JupyterLab is the next-generation user interface for Project Jupyter offering al ## Screenshots -![](./doc/screenshots/jupyterlab.png) +![Screenshot of JupyterLab](./doc/screenshots/jupyterlab.png) ## Documentation and resources -* Official app website: https://jupyterlab.readthedocs.io/en/stable/ -* Official admin documentation: https://jupyterlab.readthedocs.io/en/stable/ -* Upstream app code repository: https://github.com/jupyterhub/jupyterhub -* YunoHost documentation for this app: https://yunohost.org/app_jupyterlab -* Report a bug: https://github.com/YunoHost-Apps/jupyterlab_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/jupyterlab_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/jupyterlab_ynh/tree/testing --debug or sudo yunohost app upgrade jupyterlab -u https://github.com/YunoHost-Apps/jupyterlab_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index b818815..6869471 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # JupyterLab pour YunoHost -[![Niveau d'intégration](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) +[![Niveau d'intégration](https://dash.yunohost.org/integration/jupyterlab.svg)](https://dash.yunohost.org/appci/app/jupyterlab) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/jupyterlab.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/jupyterlab.maintain.svg) [![Installer JupyterLab avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=jupyterlab) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.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.* @@ -20,25 +24,26 @@ JupyterLab is the next-generation user interface for Project Jupyter offering al ## Captures d'écran -![](./doc/screenshots/jupyterlab.png) +![Capture d'écran de JupyterLab](./doc/screenshots/jupyterlab.png) ## Documentations et ressources -* Site officiel de l'app : https://jupyterlab.readthedocs.io/en/stable/ -* Documentation officielle de l'admin : https://jupyterlab.readthedocs.io/en/stable/ -* Dépôt de code officiel de l'app : https://github.com/jupyterhub/jupyterhub -* Documentation YunoHost pour cette app : https://yunohost.org/app_jupyterlab -* Signaler un bug : https://github.com/YunoHost-Apps/jupyterlab_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/jupyterlab_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/jupyterlab_ynh/tree/testing --debug ou sudo yunohost app upgrade jupyterlab -u https://github.com/YunoHost-Apps/jupyterlab_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 89be1f4f039f428e15430cd58feab3920c41fb45 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 23 Aug 2022 05:02:32 +0000 Subject: [PATCH 03/11] Auto-update README --- README.md | 1 + README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9768bc4..7387e64 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ JupyterLab is the next-generation user interface for Project Jupyter offering al **Shipped version:** 3.4.2~ynh1 + **Demo:** https://mybinder.org/v2/gh/jupyterlab/jupyterlab-demo/master?urlpath=lab/tree/demo ## Screenshots diff --git a/README_fr.md b/README_fr.md index 6869471..d36436c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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. -**Version incluse :** 3.4.2~ynh1 +**Version incluse :** 3.4.2~ynh1 + **Démo :** https://mybinder.org/v2/gh/jupyterlab/jupyterlab-demo/master?urlpath=lab/tree/demo From 5c693f25ddc942d4eb7b4b5369f19e9e6cd59da2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 23 Aug 2022 07:04:26 +0200 Subject: [PATCH 04/11] Fix install --- manifest.json | 2 +- scripts/_common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 52891af..5e52858 100644 --- a/manifest.json +++ b/manifest.json @@ -22,7 +22,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 12e6cc4..46cc32b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="python3-dev python3-pip libffi-dev libzmq3-dev" +pkg_dependencies="python3-dev python3-pip" nodejs_version="16" From 6383367f91417a7547e3f2a0626d057e62c8bd60 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 23 Aug 2022 07:17:29 +0200 Subject: [PATCH 05/11] 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 46cc32b..13d815a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="python3-dev python3-pip" nodejs_version="16" -jupyterlab_version="3.4.2" +jupyterlab_version="3.4.5" #================================================= # PERSONAL HELPERS From a806b1a26c4d209e58ba515b9b9e6ee290420b8d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 23 Aug 2022 07:18:20 +0200 Subject: [PATCH 06/11] Update remove --- scripts/remove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index a4d5e6e..71f2e5b 100644 --- a/scripts/remove +++ b/scripts/remove @@ -28,7 +28,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then - ynh_script_progression --message="Removing $app service integration..."--weight=2 + ynh_script_progression --message="Removing $app service integration..." --weight=2 yunohost service remove $app fi From 7fab265d8f230b974ec2fdab9a678deb0f23f851 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 23 Aug 2022 07:19:05 +0200 Subject: [PATCH 07/11] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 5e52858..75480b8 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Code console environment for running Python code interactively.", "fr": "Console de code pour exécuter du code Python de manière interactive." }, - "version": "3.4.2~ynh1", + "version": "3.4.5~ynh1", "url": "https://jupyterlab.readthedocs.io/en/stable/", "upstream": { "license": "BSD-3-Clause", From 3f022b51a0502244ccf76472a20badad1ab02bec Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 23 Aug 2022 05:19:11 +0000 Subject: [PATCH 08/11] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7387e64..d062351 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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:** 3.4.2~ynh1 +**Shipped version:** 3.4.5~ynh1 **Demo:** https://mybinder.org/v2/gh/jupyterlab/jupyterlab-demo/master?urlpath=lab/tree/demo diff --git a/README_fr.md b/README_fr.md index d36436c..aad24fe 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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. -**Version incluse :** 3.4.2~ynh1 +**Version incluse :** 3.4.5~ynh1 **Démo :** https://mybinder.org/v2/gh/jupyterlab/jupyterlab-demo/master?urlpath=lab/tree/demo From fca23b7e8399b21a49594f09e9cc2760688ba9f5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 23 Aug 2022 07:27:06 +0200 Subject: [PATCH 09/11] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 75480b8..8b4c153 100644 --- a/manifest.json +++ b/manifest.json @@ -7,10 +7,10 @@ "fr": "Console de code pour exécuter du code Python de manière interactive." }, "version": "3.4.5~ynh1", - "url": "https://jupyterlab.readthedocs.io/en/stable/", + "url": "https://jupyter.org", "upstream": { "license": "BSD-3-Clause", - "website": "https://jupyterlab.readthedocs.io/en/stable/", + "website": "https://jupyter.org", "demo": "https://mybinder.org/v2/gh/jupyterlab/jupyterlab-demo/master?urlpath=lab/tree/demo", "admindoc": "https://jupyterlab.readthedocs.io/en/stable/", "code": "https://github.com/jupyterhub/jupyterhub", From f0cfa7cfd6fdaef1c66604adc9fdd24ec0ab12d4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 23 Aug 2022 05:27:16 +0000 Subject: [PATCH 10/11] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d062351..f1c6d4e 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ JupyterLab is the next-generation user interface for Project Jupyter offering al ## Documentation and resources -* Official app website: +* Official app website: * Official admin documentation: * Upstream app code repository: * YunoHost documentation for this app: diff --git a/README_fr.md b/README_fr.md index aad24fe..5953c25 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ JupyterLab is the next-generation user interface for Project Jupyter offering al ## Documentations et ressources -* Site officiel de l'app : +* Site officiel de l'app : * Documentation officielle de l'admin : * Dépôt de code officiel de l'app : * Documentation YunoHost pour cette app : From 2ad6fe03a3053e7366392e92dbf10158e345a1ed Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 23 Aug 2022 07:27:48 +0200 Subject: [PATCH 11/11] Add FR --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 567c138..bb929f8 100644 --- a/scripts/install +++ b/scripts/install @@ -100,7 +100,7 @@ mkdir -p "$final_path" pushd $final_path mkdir -p .venv - 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 + 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 jupyterlab-language-pack-fr-FR --three popd #=================================================