From 8908f1d3017baa9b2e9e21fcc08462e0e6364adf Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 20 Dec 2020 11:33:16 +0100 Subject: [PATCH] Upgrade to 2.2.9 --- README.md | 7 +++---- README_fr.md | 7 +++---- check_process | 2 -- conf/systemd.service | 4 +++- manifest.json | 4 ++-- scripts/_common.sh | 4 ++-- scripts/install | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 6 ++++++ 9 files changed, 22 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index a74126a..55d2507 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.svg)](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.2.6 +**Shipped version:** 2.2.9 ## Screenshots @@ -50,8 +50,7 @@ How to configure this app: by an admin panel, a plain file with SSH. --- -Developers info ----------------- +## Developers info Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/jupyterlab_ynh/tree/testing). diff --git a/README_fr.md b/README_fr.md index 43a47a0..2d1a021 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) -[![Installer JupyterLab avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=jupyterlab) +[![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)* @@ -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.2.6 +**Version incluse :** 2.2.9 ## Captures d’écran @@ -50,8 +50,7 @@ Comment configurer cette application : via le panneau d'administration, un fichi --- -Informations pour les développeurs ----------------- +## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/jupyterlab_ynh/tree/testing). diff --git a/check_process b/check_process index 4ecf7c0..8cba3e2 100644 --- a/check_process +++ b/check_process @@ -16,8 +16,6 @@ multi_instance=1 port_already_use=1 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none diff --git a/conf/systemd.service b/conf/systemd.service index c10f8f0..3d0d178 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -3,13 +3,15 @@ Description=JupyterLab After=syslog.target network.target [Service] +User=__APP__ +Group=__APP__ Environment="LC_ALL=C.UTF-8" Environment="LANG=C.UTF-8" +WorkingDirectory=__FINALPATH__ Environment="PATH=__NODE_PATH__:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ExecStart=/usr/local/bin/pipenv run jupyterhub -f __FINALPATH__/config/jupyterhub_config.py Restart=always RestartSec=10 -WorkingDirectory=__FINALPATH__ [Install] WantedBy=multi-user.target \ No newline at end of file diff --git a/manifest.json b/manifest.json index 387b6b8..c15e6a2 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name": "JupyterLab", "id": "jupyterlab", "packaging_format": 1, - "version": "2.2.6~ynh1", + "version": "2.2.9~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.)" @@ -14,7 +14,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 3.8.1" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index abc6e62..b6e1fe5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,9 +7,9 @@ # dependencies used by the app pkg_dependencies="python3-dev python3-pip libffi-dev libzmq3-dev" -nodejs_version="10" +nodejs_version="12" -jupyterlab_version="2.2.6" +jupyterlab_version="2.2.9" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index a0b30fe..506212b 100644 --- a/scripts/install +++ b/scripts/install @@ -165,7 +165,7 @@ chown -R $admin: $final_path/.venv/ # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --description "$app daemon" --log_type "systemd" --log "$app" +yunohost service add $app --description="$app daemon" --log="$app" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 38823a0..699d7bc 100644 --- a/scripts/restore +++ b/scripts/restore @@ -87,13 +87,13 @@ npm install -g configurable-http-proxy ynh_script_progression --message="Restoring the systemd configuration..." ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --description "$app daemon" --log_type "systemd" --log "$app" +yunohost service add $app --description="$app daemon" --log="$app" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 3d92a49..42c21b3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -171,6 +171,12 @@ ynh_add_systemd_config chown -R root: $final_path/ chown -R $admin: $final_path/.venv/ +#================================================= +# ADVERTISE SERVICE IN ADMIN PANEL +#================================================= + +yunohost service add $app --description="$app daemon" --log="$app" + #================================================= # SETUP SSOWAT #=================================================