Merge branch 'testing'

This commit is contained in:
Josué Tille 2020-03-01 20:07:58 +01:00
commit a339b3da23
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
2 changed files with 4 additions and 3 deletions

View file

@ -17,8 +17,8 @@
setup_private=1 setup_private=1
setup_public=1 setup_public=1
upgrade=1 upgrade=1
upgrade=1 from_commit=f9b9e934f6929bd564386f06c0352f0ef41b7619 upgrade=1 from_commit=333f32482b409de753b1fe2c010c25409da99fa7
upgrade=1 from_commit=874ff38bc4e011a5ba22f006745e86ef8e052346 upgrade=1 from_commit=2574d127bca88b4dac8325b93c429c8160123719
upgrade=1 from_commit=f28bb98edd9bd018acc168a22186cc79737373a0 upgrade=1 from_commit=f28bb98edd9bd018acc168a22186cc79737373a0
backup_restore=1 backup_restore=1
multi_instance=0 multi_instance=0

View file

@ -23,7 +23,8 @@ install_dependance() {
ynh_install_app_dependencies python2.7 python-pip libpython2.7 python-setuptools python-ldap python-urllib3 python-simplejson python-imaging python-mysqldb python-flup expect python-requests python-dev ffmpeg python-memcache \ ynh_install_app_dependencies python2.7 python-pip libpython2.7 python-setuptools python-ldap python-urllib3 python-simplejson python-imaging python-mysqldb python-flup expect python-requests python-dev ffmpeg python-memcache \
libjpeg62-turbo-dev zlib1g-dev # For building pillow libjpeg62-turbo-dev zlib1g-dev # For building pillow
ynh_add_swap 2000 ynh_add_swap 2000
sudo -u $seafile_user pip install --user --upgrade Pillow 'moviepy<1.0' certifi idna # 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 pip install --user --upgrade Pillow 'moviepy<1.0' 'imageio<2.8' certifi idna
ynh_del_swap ynh_del_swap
} }