From f59da0dcbc1f35f98fbe32001e0a695171328001 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Thu, 23 Nov 2017 22:57:52 +0100 Subject: [PATCH] Fix install and upgrade References: https://cryptography.io/en/latest/faq/#installing-cryptography-fails-with-invalid-environment-marker-python-version-3 https://stackoverflow.com/a/45631202 --- scripts/install | 2 +- scripts/upgrade | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 4e898b4..664e927 100644 --- a/scripts/install +++ b/scripts/install @@ -94,7 +94,7 @@ ynh_setup_source "$final_path" #================================================= virtualenv --system-site-packages "$final_path" -bash -c "source $final_path/bin/activate && pip install --requirement $final_path/requirements-ynh.txt" +bash -c "source $final_path/bin/activate && pip install -U pip setuptools && pip install --requirement $final_path/requirements-ynh.txt" #================================================= # CONFIGURE SEARX diff --git a/scripts/upgrade b/scripts/upgrade index 7c6c81f..e2eac75 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -93,8 +93,9 @@ ynh_system_user_create $app # UPGRADE SEARX IN ITS VIRTUALENV #================================================= +rm -r $final_path/lib/python2.7/site-packages/{pip,setuptools} $final_path/lib/python2.7/site-packages/setuptools-* $final_path/lib/python2.7/site-packages/pip-* virtualenv --system-site-packages "$final_path" -bash -c "source $final_path/bin/activate && pip install --requirement $final_path/requirements-ynh.txt --upgrade" +bash -c "source $final_path/bin/activate && pip install -U pip setuptools && pip install --requirement $final_path/requirements-ynh.txt --upgrade" #================================================= # CONFIGURE SEARX