diff --git a/README.md b/README.md index 91b73d7..6eb4f9f 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Seafile for YunoHost [![Integration level](https://dash.yunohost.org/integration/seafile.svg)](https://dash.yunohost.org/appci/app/seafile) ![Working status](https://ci-apps.yunohost.org/ci/badges/seafile.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/seafile.maintain.svg) + [![Install Seafile with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=seafile) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 69420d2..e7d19b9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # Seafile pour YunoHost [![Niveau d’intégration](https://dash.yunohost.org/integration/seafile.svg)](https://dash.yunohost.org/appci/app/seafile) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/seafile.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/seafile.maintain.svg) + [![Installer Seafile avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=seafile) *[Read this readme in english.](./README.md)* diff --git a/check_process b/check_process index 529a0cf..1d329b2 100644 --- a/check_process +++ b/check_process @@ -17,8 +17,8 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=99c006ca044c1f82aee6ec68d73b59dd2de52411 - upgrade=1 from_commit=cb4a6e0d02782c75cf270276667ea2f062afd051 + upgrade=1 from_commit=3ce35d35ca4a8bac9b3d49d900af6a2b41577f9a + upgrade=1 from_commit=97c0b2f6548c2e415641533c4746682747eacb94 backup_restore=1 multi_instance=0 wrong_user=1 @@ -31,7 +31,7 @@ change_url=1 ;;; Upgrade options - ; commit=99c006ca044c1f82aee6ec68d73b59dd2de52411 + ; commit=3ce35d35ca4a8bac9b3d49d900af6a2b41577f9a name=Version 7.1 Old version for CI 4 branch - ; commit=cb4a6e0d02782c75cf270276667ea2f062afd051 + ; commit=97c0b2f6548c2e415641533c4746682747eacb94 name=Version 8.x Old version for CI 5 branch diff --git a/scripts/_common.sh b/scripts/_common.sh index 6f2ee35..f34215f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -44,7 +44,7 @@ install_dependance() { chown -R $seafile_user:$seafile_user $final_path # Note that we install imageio to force the dependance, without this imageio 2.8 is installed and it need python3.5 - sudo -u $seafile_user pip3 install --user --no-warn-script-location --upgrade future mysqlclient PyMySQL Pillow pylibmc captcha Jinja2 SQLAlchemy psd-tools django-pylibmc django-simple-captcha python3-ldap pycryptodome==3.12.0 cffi==1.14.0 + sudo -u $seafile_user pip3 install --user --no-warn-script-location --upgrade future mysqlclient PyMySQL 'Pillow<10.0.0' pylibmc captcha Jinja2 SQLAlchemy psd-tools django-pylibmc django-simple-captcha python3-ldap pycryptodome==3.12.0 cffi==1.14.0 # TODO add dependance when upgrade to seafile 8: django==2.2.* ynh_del_swap }