Skip to content

Commit 36ee8ee

Browse files
authored
Merge pull request #292 from YunoHost-Apps/testing
Testing
2 parents 6695a76 + 4c00017 commit 36ee8ee

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

scripts/install

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ fi
8383

8484
pushd $install_dir
8585
python3 -m venv $install_dir/venv
86-
source $install_dir/venv/bin/activate
87-
ynh_hide_warnings pip install --upgrade pip wheel toml
88-
ynh_hide_warnings pip install --editable ./api
89-
deactivate
86+
#FIXME: setuptools 62.x is a downgrade meant to keep django-allauth installing
87+
#remove once upsteam updates to 0.50+
88+
ynh_hide_warnings $install_dir/venv/bin/pip install --upgrade pip wheel toml setuptools==62.0.0 poetry-core==1.8.1
89+
ynh_hide_warnings $install_dir/venv/bin/pip install --editable ./api --no-build-isolation
9090
popd
9191

9292
#=================================================
@@ -95,18 +95,14 @@ popd
9595
ynh_script_progression "Building funkwhale..."
9696

9797
pushd $install_dir
98-
source $install_dir/venv/bin/activate
99-
10098
# needed for enabling the 'unaccent' extension
10199
ynh_psql_db_shell <<< "ALTER USER $db_user WITH SUPERUSER;"
102100

103101
ynh_hide_warnings ynh_exec_as_app $install_dir/venv/bin/funkwhale-manage migrate
104102
ynh_psql_db_shell <<< "ALTER USER $db_user WITH NOSUPERUSER;"
105103

106-
echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('$admin', '$admin_mail', 'funkwhale') " | ynh_hide_warnings python api/manage.py shell
104+
echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('$admin', '$admin_mail', 'funkwhale') " | ynh_hide_warnings $install_dir/venv/bin/python api/manage.py shell
107105
echo "yes" | ynh_hide_warnings ynh_exec_as_app $install_dir/venv/bin/funkwhale-manage collectstatic
108-
109-
deactivate
110106
popd
111107

112108
chmod 750 "$install_dir"

scripts/upgrade

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ pushd $install_dir
5959
ynh_safe_rm "$install_dir/venv"
6060

6161
python3 -m venv $install_dir/venv
62-
source $install_dir/venv/bin/activate
63-
ynh_hide_warnings pip install --upgrade pip wheel toml
64-
ynh_hide_warnings pip install --editable ./api
65-
deactivate
62+
#FIXME: setuptools 62.x is a downgrade meant to keep django-allauth installing
63+
#remove once upsteam updates to 0.50+
64+
ynh_hide_warnings $install_dir/venv/bin/pip install --upgrade pip wheel toml setuptools==62.0.0 poetry-core==1.8.1
65+
ynh_hide_warnings $install_dir/venv/bin/pip install --editable ./api --no-build-isolation
6666
popd
6767

6868
#=================================================

0 commit comments

Comments
 (0)