From a5d2bc6560ffb47dc9bd2c027e6c66efcdce8267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Mon, 5 Apr 2021 12:55:40 +0200
Subject: [PATCH] Fix issue #248 and #244
---
scripts/_common.sh | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts/_common.sh b/scripts/_common.sh
index edc919b..79a4564 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -40,9 +40,9 @@ install_sources() {
if [ -e $final_path/.rustup ]; then
sudo -u "$synapse_user" env PATH=$PATH rustup update
else
- sudo -u "$synapse_user" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable'
+ sudo -u "$synapse_user" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable --profile=minimal'
fi
-
+
# Install virtualenv if it don't exist
test -e $final_path/bin/python3 || python3 -m venv $final_path
@@ -57,7 +57,8 @@ install_sources() {
chown $synapse_user:root -R $final_path
sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade 'cryptography>=3.3'
pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2
- pip3 install --upgrade 'Twisted>=20.3.0<21' matrix-synapse==$upstream_version matrix-synapse-ldap3
+ # Fix issue https://github.com/YunoHost-Apps/synapse_ynh/issues/248
+ pip3 install --upgrade 'Twisted>=21' 'treq>=21.1.0' matrix-synapse==$upstream_version matrix-synapse-ldap3
# This function was defined when we called "source $final_path/bin/activate". With this function we undo what "$final_path/bin/activate" does
set +$u_arg;