From 1c867f23edd8cd3c205403b79c7e39aec0e1ce34 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 10 May 2021 19:14:43 +0200 Subject: [PATCH 1/6] 3.0.15 --- README.md | 4 ++-- README_fr.md | 4 ++-- scripts/_common.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e23d5fc..ee97b1d 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ *[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.* +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:** 3.0.14 +**Shipped version:** 3.0.15 ## Screenshots diff --git a/README_fr.md b/README_fr.md index fdc357d..22da928 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,12 +6,12 @@ *[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.* +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 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 :** 3.0.14 +**Version incluse :** 3.0.15 ## Captures d’écran diff --git a/scripts/_common.sh b/scripts/_common.sh index 13f3b5b..0f9f481 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="15" -jupyterlab_version="3.0.14" +jupyterlab_version="3.0.15" #================================================= # PERSONAL HELPERS From a7a00eedb84b4585fe85d28b3b5eda4332858099 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 11 May 2021 03:03:33 +0200 Subject: [PATCH 2/6] [autopatch] Update issue and PR templates --- pull_request_template.md | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 pull_request_template.md diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 0a198cf..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## 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. - -## Package_check results ---- -* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* From 065581e9a6c228c9bb40222bbe2a90ad566cccf3 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 13 May 2021 17:48:16 +0200 Subject: [PATCH 3/6] [autopatch] Update issue and PR templates --- .github/ISSUE_TEMPLATE.md | 55 ++++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++++ pull_request_template.md | 16 ---------- 3 files changed, 71 insertions(+), 16 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 pull_request_template.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..2729a6b --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Determine if you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install the_app + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 0a198cf..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## 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. - -## Package_check results ---- -* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* From 7aadbfb9b13a01cd25589534fc047b4aa5aff56c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 18 May 2021 22:51:12 +0200 Subject: [PATCH 4/6] Upgrade to version 3.0.16 --- README.md | 2 +- README_fr.md | 2 +- check_process | 8 ++++---- manifest.json | 2 +- scripts/_common.sh | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index ee97b1d..a34bc05 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 k ## 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:** 3.0.15 +**Shipped version:** 3.0.16 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 22da928..78836d3 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 :** 3.0.15 +**Version incluse :** 3.0.16 ## Captures d’écran diff --git a/check_process b/check_process index 8cba3e2..c42f668 100644 --- a/check_process +++ b/check_process @@ -1,9 +1,9 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/jupyterlab" (PATH) - admin="john" (USER) - is_public=1 (PUBLIC|public=1|private=0) + domain="domain.tld" + path="/jupyterlab" + admin="john" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/manifest.json b/manifest.json index 307d494..c852dcc 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.0.13~ynh1", + "version": "3.0.16~ynh1", "url": "https://jupyterlab.readthedocs.io/en/stable/", "license": "BSD-3-Clause", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 0f9f481..06b6cdd 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="15" -jupyterlab_version="3.0.15" +jupyterlab_version="3.0.16" #================================================= # PERSONAL HELPERS From 7b34f0705c15f4c9873b138ba4e3de50a79aefef Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 24 May 2021 10:33:46 +0200 Subject: [PATCH 5/6] Update remove --- scripts/remove | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/scripts/remove b/scripts/remove index cd5357f..2fc6809 100644 --- a/scripts/remove +++ b/scripts/remove @@ -69,28 +69,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# CLOSE A PORT -#================================================= - -if yunohost firewall list | grep -q "\- $port$" -then - ynh_script_progression --message="Closing port $port..." - ynh_exec_warn_less yunohost firewall disallow TCP $port -fi - -if yunohost firewall list | grep -q "\- $port_hub$" -then - ynh_script_progression --message="Closing port $port_hub..." - ynh_exec_warn_less yunohost firewall disallow TCP $port_hub -fi - -if yunohost firewall list | grep -q "\- $port_http_proxy$" -then - ynh_script_progression --message="Closing port $port_http_proxy..." - ynh_exec_warn_less yunohost firewall disallow TCP $port_http_proxy -fi - #================================================= # REMOVE DEDICATED USER #================================================= From eda5597a90522538cf4f69f57280bfba54254724 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 24 May 2021 10:34:07 +0200 Subject: [PATCH 6/6] Update install --- scripts/install | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/install b/scripts/install index c1dae89..290fff2 100644 --- a/scripts/install +++ b/scripts/install @@ -64,10 +64,6 @@ port=$(ynh_find_port --port=8080) port_hub=$(ynh_find_port --port=$(($port + 1))) port_http_proxy=$(ynh_find_port --port=$(($port_hub + 1))) -# Open this port -#ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port -#ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port_hub -#ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port_http_proxy ynh_app_setting_set --app=$app --key=port --value=$port ynh_app_setting_set --app=$app --key=port_hub --value=$port_hub ynh_app_setting_set --app=$app --key=port_http_proxy --value=$port_http_proxy