YunoHost-Apps/jupyterlab_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/jupyterlab_ynh.git synced 2024-09-03 19:26:35 +02:00
Code Issues Activity Actions

Merge pull request #136 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2023-07-27 08:30:07 +01:00 committed by GitHub
commit ca6e77f9f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -19,7 +19,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. 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:** 4.0.2~ynh1 **Shipped version:** 4.0.2~ynh2
**Demo:** https://mybinder.org/v2/gh/jupyterlab/jupyterlab-demo/master?urlpath=lab/tree/demo **Demo:** https://mybinder.org/v2/gh/jupyterlab/jupyterlab-demo/master?urlpath=lab/tree/demo

2
README_fr.md
View file

@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
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. 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 :** 4.0.2~ynh1 **Version incluse :** 4.0.2~ynh2
**Démo :** https://mybinder.org/v2/gh/jupyterlab/jupyterlab-demo/master?urlpath=lab/tree/demo **Démo :** https://mybinder.org/v2/gh/jupyterlab/jupyterlab-demo/master?urlpath=lab/tree/demo

4
conf/systemd.service
View file

@ -8,8 +8,8 @@ User=root
WorkingDirectory=__FINALPATH__/ WorkingDirectory=__FINALPATH__/
Environment="LC_ALL=C.UTF-8" Environment="LC_ALL=C.UTF-8"
Environment="LANG=C.UTF-8" Environment="LANG=C.UTF-8"
Environment="__YNH_NODE_LOAD_PATH__:__FINALPATH__/.venv/bin" Environment="__YNH_NODE_LOAD_PATH__:__FINALPATH__/venv/bin"
ExecStart=__FINALPATH__/.venv/bin/jupyterhub -f __FINALPATH__/config/jupyterhub_config.py --upgrade-db ExecStart=__FINALPATH__/venv/bin/jupyterhub -f __FINALPATH__/config/jupyterhub_config.py --upgrade-db
Restart=always Restart=always
RestartSec=10 RestartSec=10

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Code console environment for running Python code interactively", "en": "Code console environment for running Python code interactively",
"fr": "Console de code pour exécuter du code Python de manière interactive" "fr": "Console de code pour exécuter du code Python de manière interactive"
}, },
"version": "4.0.2~ynh1", "version": "4.0.2~ynh2",
"url": "https://jupyter.org", "url": "https://jupyter.org",
"upstream": { "upstream": {
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

2
scripts/_common.sh
View file

@ -5,7 +5,7 @@
#================================================= #=================================================
# dependencies used by the app # dependencies used by the app
pkg_dependencies="python3-dev python3-pip" pkg_dependencies="python3-dev python3-pip python3-venv"
nodejs_version="18" nodejs_version="18"

7
scripts/install
View file

@ -99,8 +99,9 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
mkdir -p "$final_path" mkdir -p "$final_path"
pushd $final_path pushd $final_path
mkdir -p .venv python3 -m venv $final_path/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 jupyterlab-language-pack-fr-FR source $final_path/venv/bin/activate
ynh_exec_warn_less pip install jupyterlab==$jupyterlab_version jupyterhub jupyter_collaboration notebook jupyterhub-ldapauthenticator pyzmq jupyterlab-language-pack-fr-FR
popd popd
#================================================= #=================================================
@ -116,7 +117,7 @@ ynh_add_config --template="../conf/jupyterhub_config.py" --destination="$final_p
ynh_add_config --template="../conf/jupyter_notebook_config.py" --destination="$final_path/config/jupyter_notebook_config.py" ynh_add_config --template="../conf/jupyter_notebook_config.py" --destination="$final_path/config/jupyter_notebook_config.py"
chown -R root: $final_path/ chown -R root: $final_path/
chown -R $admin: $final_path/.venv/ chown -R $admin: $final_path/venv/
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD

3
scripts/restore
View file

@ -57,7 +57,7 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
ynh_restore_file --origin_path="$final_path" ynh_restore_file --origin_path="$final_path"
chown -R root: $final_path/ chown -R root: $final_path/
chown -R $admin: $final_path/.venv/ chown -R $admin: $final_path/venv/
#================================================= #=================================================
# SPECIFIC RESTORATION # SPECIFIC RESTORATION
@ -71,7 +71,6 @@ ynh_install_app_dependencies $pkg_dependencies
ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
ynh_use_nodejs ynh_use_nodejs
$ynh_npm install -g configurable-http-proxy $ynh_npm install -g configurable-http-proxy
python3 -m pip install pipenv
#================================================= #=================================================
# RESTORE SYSTEMD # RESTORE SYSTEMD

18
scripts/upgrade
View file

@ -28,7 +28,6 @@ enable_terminal=$(ynh_app_setting_get --app=$app --key=enable_terminal)
#================================================= #=================================================
# CHECK VERSION # CHECK VERSION
#================================================= #=================================================
ynh_script_progression --message="Checking version..."
upgrade_type=$(ynh_check_app_version_changed) upgrade_type=$(ynh_check_app_version_changed)
@ -64,9 +63,7 @@ ynh_script_progression --message="Ensuring downward compatibility..."
# If final_path doesn't exist, create it # If final_path doesn't exist, create it
if [ -z "$final_path" ]; then if [ -z "$final_path" ]; then
final_path=/opt/$app final_path=/opt/$app
mkdir -p $final_path mkdir -p $final_path
ynh_app_setting_set --app=$app --key=final_path --value=$final_path ynh_app_setting_set --app=$app --key=final_path --value=$final_path
fi fi
@ -88,13 +85,13 @@ ynh_add_nginx_config
#================================================= #=================================================
# UPGRADE DEPENDENCIES # UPGRADE DEPENDENCIES
#================================================= #=================================================
ynh_script_progression --message="Upgrading dependencies..." --weight=83 ynh_script_progression --message="Upgrading dependencies..." --weight=10
ynh_install_app_dependencies $pkg_dependencies ynh_install_app_dependencies $pkg_dependencies
ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
ynh_use_nodejs ynh_use_nodejs
$ynh_npm install -g configurable-http-proxy
python3 -m pip install pipenv $ynh_npm install -g configurable-http-proxy npm
#================================================= #=================================================
# SPECIFIC UPGRADE # SPECIFIC UPGRADE
@ -106,9 +103,12 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
ynh_script_progression --message="Building app..." --weight=160 ynh_script_progression --message="Building app..." --weight=160
ynh_secure_remove $final_path/.venv
python3 -m venv $final_path/venv
source $final_path/venv/bin/activate
pushd $final_path pushd $final_path
mkdir -p .venv ynh_exec_warn_less pip install jupyterlab==$jupyterlab_version jupyterhub notebook jupyter_collaboration jupyterhub-ldapauthenticator pyzmq
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
popd popd
fi fi
@ -126,7 +126,7 @@ ynh_add_config --template="../conf/jupyterhub_config.py" --destination="$final_p
ynh_add_config --template="../conf/jupyter_notebook_config.py" --destination="$final_path/config/jupyter_notebook_config.py" ynh_add_config --template="../conf/jupyter_notebook_config.py" --destination="$final_path/config/jupyter_notebook_config.py"
chown -R root: $final_path/ chown -R root: $final_path/
chown -R $admin: $final_path/.venv/ chown -R $admin: $final_path/venv/
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD