From 6b3ee3fbc1e8260d7c2950c65d772290f5e0f596 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 Mar 2020 14:55:03 +0100 Subject: [PATCH 01/16] add README_fr --- README.md | 4 +++- README_fr.md | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 README_fr.md diff --git a/README.md b/README.md index 6b6ba5e..8d9a4d6 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,15 @@ [![Integration level](https://dash.yunohost.org/integration/jupyterlab.svg)](https://dash.yunohost.org/appci/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. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* ## 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:** v2.0.1 +**Shipped version:** 2.0.1 ## Screenshots diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..6955dd9 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,64 @@ +# JupyterLab pour YunoHost + +[![Integration level](https://dash.yunohost.org/integration/jupyterlab.svg)](https://dash.yunohost.org/appci/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.* + +## Vue d'ensemble +JupyterLab est une interface utilisateur de nouvelle génération pour le project Jupyter offrant tous les blocs de construction des Notebooks Jupyter classique (interpréteur python, terminal, éditeur de texte, navigateur de fichiers, etc.) dans une interface utilisateur flexible et puissante. JupyterLab remplacera à terme le Notebooks Jupyter classique. + +**Version incluse:** 2.0.1 + +## Captures d'écran + +![](https://raw.githubusercontent.com/jupyterlab/jupyterlab/3e3a2c9e295703ff6d441589423e284cc6d5c245/docs/source/images/jupyterlab.png) + +## Démo + +* [Démo sur Binder](https://mybinder.org/v2/gh/jupyterlab/jupyterlab-demo/master?urlpath=lab/tree/demo) + +## Configuration + +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/) + +## Caractéristiques spécifiques YunoHost + +#### Support multi-utilisateurs + +L'authentification LDAP et HTTP est-elle prise en charge? **Oui** +L'application peut-elle être utilisée par plusieurs utilisateurs? **Oui** + +#### 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/) +* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/jupyterlab%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jupyterlab/) +* Jessie x86-64b - [![](https://ci-stretch.nohost.me/ci/logs/jupyterlab%20%28Community%29.svg)](https://ci-stretch.nohost.me/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 web YunoHost: https://yunohost.org/ + +--- + +Informations pour les développeurs +---------------- + +**Seulement si vous voulez utiliser une branche de test pour le codage, au lieu de fusionner directement dans la banche principale.** +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. +``` +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 +``` From 29ff800f88a43e02d6e991ec1e47c700b1b4dc0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 28 Mar 2020 08:28:29 +0100 Subject: [PATCH 02/16] Update README_fr.md --- README_fr.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README_fr.md b/README_fr.md index 6955dd9..78f7170 100644 --- a/README_fr.md +++ b/README_fr.md @@ -9,7 +9,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* ## Vue d'ensemble -JupyterLab est une interface utilisateur de nouvelle génération pour le project Jupyter offrant tous les blocs de construction des Notebooks Jupyter classique (interpréteur python, terminal, éditeur de texte, navigateur de fichiers, etc.) dans une interface utilisateur flexible et puissante. JupyterLab remplacera à terme le Notebooks Jupyter classique. +JupyterLab est une interface utilisateur de nouvelle génération pour le projet Jupyter offrant tous les blocs de construction des Jupyter Notebooks classiques (interpréteur Python, terminal, éditeur de texte, navigateur de fichiers, etc.) dans une interface utilisateur flexible et puissante. JupyterLab remplacera à terme les Jupyter Notebooks classiques. **Version incluse:** 2.0.1 @@ -23,7 +23,7 @@ JupyterLab est une interface utilisateur de nouvelle génération pour le projec ## 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 @@ -33,8 +33,8 @@ Comment configurer cette application: via le panneau d'administration, un fichie #### Support multi-utilisateurs -L'authentification LDAP et HTTP est-elle prise en charge? **Oui** -L'application peut-elle être utilisée par plusieurs utilisateurs? **Oui** + * L'authentification LDAP et HTTP est-elle prise en charge? **Oui** + * L'application peut-elle être utilisée par plusieurs utilisateurs? **Oui** #### Architectures supportées From 1d8b974fe43b1a61289d02ca8cdc9ffcb4a7dece Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 Mar 2020 11:36:54 +0200 Subject: [PATCH 03/16] update README --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8d9a4d6..3d868a8 100644 --- a/README.md +++ b/README.md @@ -27,14 +27,14 @@ How to configure this app: by an admin panel, a plain file with SSH. ## Documentation - * Official documentation: [Link to the official documentation of this app](https://jupyterlab.readthedocs.io/en/stable/) +* Official documentation: [Link to the official documentation of this app](https://jupyterlab.readthedocs.io/en/stable/) ## YunoHost specific features #### Multi-users support -LDAP auth supported? **Yes** -Can the app be used by multiple users? **Yes** +* LDAP auth supported? **Yes** +* Can the app be used by multiple users? **Yes** #### Supported architectures @@ -44,9 +44,9 @@ Can the app be used by multiple users? **Yes** ## Links - * Report a bug: https://github.com/YunoHost-Apps/jupyterlab_ynh/issues - * App website: https://jupyter.org/index.html - * YunoHost website: https://yunohost.org/ +* Report a bug: https://github.com/YunoHost-Apps/jupyterlab_ynh/issues +* App website: https://jupyter.org/index.html +* YunoHost website: https://yunohost.org/ --- From 2af602a8d965201ea543747d978ee4cb0cccaccf Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 Mar 2020 11:37:05 +0200 Subject: [PATCH 04/16] Update README_fr.md --- README_fr.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/README_fr.md b/README_fr.md index 78f7170..92495e6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,14 +27,19 @@ Comment configurer cette application : via le panneau d'administration, un fichi ## 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 +<<<<<<< Updated upstream * L'authentification LDAP et HTTP 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** +>>>>>>> Stashed changes #### Architectures supportées @@ -44,9 +49,9 @@ Comment configurer cette application : via le panneau d'administration, un fichi ## 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 4d05e51203ebf96af9020e32280f74a3c279e13c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 Mar 2020 11:42:23 +0200 Subject: [PATCH 05/16] Update README_fr.md --- README_fr.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README_fr.md b/README_fr.md index 92495e6..1c90aa4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,7 @@ 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 @@ -33,13 +33,10 @@ Comment configurer cette application : via le panneau d'administration, un fichi #### Support multi-utilisateurs -<<<<<<< Updated upstream - * L'authentification LDAP et HTTP est-elle prise en charge? **Oui** - * L'application peut-elle être utilisée par plusieurs utilisateurs? **Oui** -======= +* L'authentification LDAP et HTTP 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** ->>>>>>> Stashed changes #### Architectures supportées From 554e41d9ae0e9719a01216036e641c297cbb1e8a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 Mar 2020 13:00:04 +0200 Subject: [PATCH 06/16] Update README_fr.md --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 1c90aa4..efa64a0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -9,7 +9,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* ## Vue d'ensemble -JupyterLab est une interface utilisateur de nouvelle génération pour le projet Jupyter offrant tous les blocs de construction des Jupyter Notebooks classiques (interpréteur Python, terminal, éditeur de texte, navigateur de fichiers, etc.) dans une interface utilisateur flexible et puissante. JupyterLab remplacera à terme les Jupyter Notebooks classiques. +JupyterLab est une interface utilisateur de nouvelle génération pour le projet Jupyter offrant tous les modules des Jupyter Notebooks classiques (interpréteur Python, terminal, éditeur de texte, navigateur de fichiers, etc.) dans une interface utilisateur flexible et puissante. JupyterLab remplacera à terme les Jupyter Notebooks classiques. **Version incluse:** 2.0.1 From d47754f0e4c669a76c86dd22de2a4d3be73c683f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 Mar 2020 13:09:30 +0200 Subject: [PATCH 07/16] Update README_fr.md --- README_fr.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README_fr.md b/README_fr.md index efa64a0..4135163 100644 --- a/README_fr.md +++ b/README_fr.md @@ -9,7 +9,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* ## Vue d'ensemble -JupyterLab est une interface utilisateur de nouvelle génération pour le projet Jupyter offrant tous les modules des Jupyter Notebooks classiques (interpréteur Python, terminal, éditeur de texte, navigateur de fichiers, etc.) dans une interface utilisateur flexible et puissante. JupyterLab remplacera à terme les Jupyter Notebooks classiques. +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.0.1 @@ -33,8 +33,6 @@ Comment configurer cette application: via le panneau d'administration, un fichie #### Support multi-utilisateurs -* L'authentification LDAP et HTTP 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** From fc02367a49081937e32efa74f3dd68099131d9d5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 30 Mar 2020 17:02:36 +0200 Subject: [PATCH 08/16] add status badge --- README.md | 3 ++- README_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3d868a8..f0c32b0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # JupyterLab for YunoHost -[![Integration level](https://dash.yunohost.org/integration/jupyterlab.svg)](https://dash.yunohost.org/appci/app/jupyterlab) +[![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) [![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)* diff --git a/README_fr.md b/README_fr.md index 4135163..bd39aee 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,7 @@ # JupyterLab pour YunoHost -[![Integration level](https://dash.yunohost.org/integration/jupyterlab.svg)](https://dash.yunohost.org/appci/app/jupyterlab) +[![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) [![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)* From 890313cdb53853b03ff02ab40e167b196e08bec0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 30 Mar 2020 17:21:34 +0200 Subject: [PATCH 09/16] add status badges --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f0c32b0..1fcd78a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # 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) +[![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) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index bd39aee..86c5e2d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,6 @@ # 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) +[![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) *[Read this readme in english.](./README.md)* From 4814b0ac6002e3b9f3335bf9fbfb18646d462f6d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 30 Mar 2020 17:22:52 +0200 Subject: [PATCH 10/16] add status badge --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 1fcd78a..7be40e8 100644 --- a/README.md +++ b/README.md @@ -1,6 +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) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 86c5e2d..4759127 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +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) *[Read this readme in english.](./README.md)* From c8d10714acc7578fe42c853dca2b4e89e51c3242 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 30 Mar 2020 17:51:08 +0200 Subject: [PATCH 11/16] add status badge --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7be40e8..540fd23 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # 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) ![](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) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 4759127..ed486a0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,6 @@ # 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) - +[![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) *[Read this readme in english.](./README.md)* From 624d1d39d667cc55785596927a89c9ae1a3c36f2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 31 Mar 2020 23:13:18 +0200 Subject: [PATCH 12/16] Create pull_request_template.md --- pull_request_template.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pull_request_template.md diff --git a/pull_request_template.md b/pull_request_template.md new file mode 100644 index 0000000..e02a3fa --- /dev/null +++ b/pull_request_template.md @@ -0,0 +1,24 @@ +## Problem +- *Description of why you made this PR* + +## Solution +- *And how you fix that* + +## PR Status +- [ ] Code finished. +- [ ] Tested with Package_check. +- [ ] Fix or enhancement tested. +- [ ] Upgrade from last version tested. +- [ ] Can be reviewed and tested. + +## Validation +--- +*Minor decision* +- **Upgrade previous version** : +- [ ] **Code review** : +- [ ] **Approval (LGTM)** : +- [ ] **Approval (LGTM)** : +- **CI succeeded** : +[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/jupyterlab_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/jupyterlab_ynh%20PR-NUM-/) +*Please replace '-NUM-' in this link by the PR number.* +When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. From bb9bc0a07f2dfe176b13cdbcac73b71b00a03987 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 9 Apr 2020 14:21:50 +0200 Subject: [PATCH 13/16] update to v. 2.1.0 --- 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 540fd23..d5ff392 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.0.1 +**Shipped version:** 2.1.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index ed486a0..18c82d7 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.0.1 +**Version incluse:** 2.1.0 ## Captures d'écran diff --git a/manifest.json b/manifest.json index cb5e54d..f45db32 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "JupyterLab", "id": "jupyterlab", "packaging_format": 1, - "version": "2.0.1~ynh2", + "version": "2.1.0~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 c2ffef4..31d53da 100644 --- a/scripts/upgrade.d/upgrade.sh +++ b/scripts/upgrade.d/upgrade.sh @@ -1 +1 @@ -jupyterlab_version="2.0.1" +jupyterlab_version="2.1.0" From c2fc843b98759dd60e9610d914640f365b808167 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 10 Apr 2020 12:09:02 +0200 Subject: [PATCH 14/16] 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 d5ff392..3e48ade 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ *[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 18c82d7..b07f318 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer jupyterlab rapidement et simplement sur un serveur Yunohost. +> *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 From a7b22ac0a97b2707003c2977c7306e21a3c2367c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 10 Apr 2020 12:19:11 +0200 Subject: [PATCH 15/16] update README --- README.md | 2 -- README_fr.md | 2 -- 2 files changed, 4 deletions(-) diff --git a/README.md b/README.md index 3e48ade..6c1b610 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,6 @@ How to configure this app: by an admin panel, a plain file with SSH. * x86-64b - [![](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/) -* Jessie x86-64b - [![](https://ci-stretch.nohost.me/ci/logs/jupyterlab%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/jupyterlab/) ## Links @@ -53,7 +52,6 @@ How to configure this app: by an admin panel, a plain file with SSH. Developers info ---------------- -**Only if you want to use a testing branch for coding, instead of merging directly into master.** Please do 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. diff --git a/README_fr.md b/README_fr.md index b07f318..d51b062 100644 --- a/README_fr.md +++ b/README_fr.md @@ -40,7 +40,6 @@ Comment configurer cette application: via le panneau d'administration, un fichie * x86-64b - [![](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/) -* Jessie x86-64b - [![](https://ci-stretch.nohost.me/ci/logs/jupyterlab%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/jupyterlab/) ## Liens @@ -53,7 +52,6 @@ Comment configurer cette application: via le panneau d'administration, un fichie Informations pour les développeurs ---------------- -**Seulement si vous voulez utiliser une branche de test pour le codage, au lieu de fusionner directement dans la banche principale.** 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. From 6587123f0158f20a0734b6886d09d2c962abc2c4 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 10 Apr 2020 19:25:39 +0200 Subject: [PATCH 16/16] Adding update_config_files.md --- conf/jupyter_notebook_config.py | 2 +- conf/jupyterhub_config.py | 8 ++++---- update_config_files.md | 30 ++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 update_config_files.md diff --git a/conf/jupyter_notebook_config.py b/conf/jupyter_notebook_config.py index 9cb14eb..3f2398f 100644 --- a/conf/jupyter_notebook_config.py +++ b/conf/jupyter_notebook_config.py @@ -873,4 +873,4 @@ c.NotebookApp.terminals_enabled = bool(__ENABLE_TERMINAL__) ## The websocket url of the Kernel or Enterprise Gateway server. If not # provided, this value will correspond to the value of the Gateway url with 'ws' # in place of 'http'. (JUPYTER_GATEWAY_WS_URL env var) -#c.GatewayClient.ws_url = None \ No newline at end of file +#c.GatewayClient.ws_url = None diff --git a/conf/jupyterhub_config.py b/conf/jupyterhub_config.py index 3ae7b71..6003979 100644 --- a/conf/jupyterhub_config.py +++ b/conf/jupyterhub_config.py @@ -91,9 +91,9 @@ # e.g. `c.JupyterHub.authenticator_class = 'pam'` # # Currently installed: -# - dummy: jupyterhub.auth.DummyAuthenticator -# - pam: jupyterhub.auth.PAMAuthenticator # - default: jupyterhub.auth.PAMAuthenticator +# - pam: jupyterhub.auth.PAMAuthenticator +# - dummy: jupyterhub.auth.DummyAuthenticator c.JupyterHub.authenticator_class = 'ldapauthenticator.LDAPAuthenticator' ## The base URL of the entire application. @@ -108,7 +108,7 @@ c.JupyterHub.authenticator_class = 'ldapauthenticator.LDAPAuthenticator' ## The public facing URL of the whole JupyterHub application. # # This is the address on which the proxy will bind. Sets protocol, ip, base_url -c.JupyterHub.bind_url = 'http://:__PORT____PATH__' +#c.JupyterHub.bind_url = 'http://:8000' ## Whether to shutdown the proxy when the Hub shuts down. # @@ -466,8 +466,8 @@ c.ConfigurableHTTPProxy.api_url = 'http://127.0.0.1:__PORT_HTTP_PROXY__' # e.g. `c.JupyterHub.spawner_class = 'localprocess'` # # Currently installed: -# - simple: jupyterhub.spawner.SimpleLocalProcessSpawner # - default: jupyterhub.spawner.LocalProcessSpawner +# - simple: jupyterhub.spawner.SimpleLocalProcessSpawner # - localprocess: jupyterhub.spawner.LocalProcessSpawner #c.JupyterHub.spawner_class = 'jupyterhub.spawner.LocalProcessSpawner' diff --git a/update_config_files.md b/update_config_files.md new file mode 100644 index 0000000..c781ac6 --- /dev/null +++ b/update_config_files.md @@ -0,0 +1,30 @@ +# Updating configuration files + +Install the new version of the app with: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/jupyterlab_ynh/tree/testing +``` + +Navigate to the installation path (`/opt/jupyterlab` by default), and run : + +```bash +pipenv shell +``` + +You are now in the virtual environment of jupyterlab. You can execute these two commands: + +- To generate the `jupyterhub_config.py` file: + +```bash +jupyterhub --generate-config +``` + +- To generate the `jupyter_notebook_config.py` file: + +```bash +jupyter notebook --generate-config +cp $HOME/.jupyter/jupyter_notebook_config.py ./ +``` + +You can now update the old template files with the new one.