From 3a01573e41fd63a18679aa7dee53937905ed54ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 20 Feb 2023 19:59:21 +0100 Subject: [PATCH] Fix --- check_process | 27 -------------------- manifest.json | 63 ---------------------------------------------- manifest.toml | 4 +-- scripts/_common.sh | 3 --- scripts/backup | 20 --------------- tests.toml | 6 +++++ 6 files changed, 8 insertions(+), 115 deletions(-) delete mode 100644 check_process delete mode 100644 manifest.json diff --git a/check_process b/check_process deleted file mode 100644 index 34423a2..0000000 --- a/check_process +++ /dev/null @@ -1,27 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/jupyterlab" - is_public=1 - admin="john" - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - # 3.3.2~ynh1 - upgrade=1 from_commit=511bcaf0c85174581212f3caa412182def2d0451 - backup_restore=1 - multi_instance=1 - port_already_use=0 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=511bcaf0c85174581212f3caa412182def2d0451 - name=Merge pull request #106 from YunoHost-Apps/testing - manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666& diff --git a/manifest.json b/manifest.json deleted file mode 100644 index 59be502..0000000 --- a/manifest.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "name": "JupyterLab", - "id": "jupyterlab", - "packaging_format": 1, - "description": { - "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.6.1~ynh2", - "url": "https://jupyter.org", - "upstream": { - "license": "BSD-3-Clause", - "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", - "cpe": "cpe:2.3:a:jupyter:nbdime-jupyterlab" - }, - "license": "BSD-3-Clause", - "maintainer": { - "name": "kay0u", - "email": "pierre@kayou.io" - }, - "requirements": { - "yunohost": ">= 11.0.9" - }, - "multi_instance": true, - "services": [ - "nginx" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "path", - "type": "path", - "example": "/jupyterlab", - "default": "/jupyterlab" - }, - { - "name": "is_public", - "type": "boolean", - "default": true - }, - { - "name": "admin", - "type": "user" - }, - { - "name": "enable_terminal", - "type": "boolean", - "ask": { - "en": "Enable terminal in the lab?", - "fr": "Activer le terminal dans le lab ?" - }, - "default": true - } - ] - } -} \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 6ff93ad..c8c3e00 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,11 +18,11 @@ code = "https://github.com/jupyterhub/jupyterhub" [integration] yunohost = ">= 11.1.8" -architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] +architectures = "all" multi_instance = true ldap = true sso = false -disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... +disk = "50M" ram.build = "50M" ram.runtime = "50M" diff --git a/scripts/_common.sh b/scripts/_common.sh index 31ff211..4bcc8e5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,6 @@ # COMMON VARIABLES #================================================= -# dependencies used by the app -#REMOVEME? pkg_dependencies="python3-dev python3-pip" - nodejs_version="16" jupyterlab_version="3.6.1" diff --git a/scripts/backup b/scripts/backup index 367681a..7189d8c 100644 --- a/scripts/backup +++ b/scripts/backup @@ -10,26 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -#REMOVEME? ynh_clean_setup () { - true -} -# Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -#REMOVEME? ynh_print_info --message="Loading installation settings..." - -#REMOVEME? app=$YNH_APP_INSTANCE_NAME - -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) - #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= diff --git a/tests.toml b/tests.toml index 2e199f4..2eb0b8f 100644 --- a/tests.toml +++ b/tests.toml @@ -2,6 +2,12 @@ test_format = 1.0 [default] + # ------------------------------- + # Default args to use for install + # ------------------------------- + + args.enable_terminal = true + # ------------------------------- # Commits to test upgrade from # -------------------------------