Skip to content

Commit

Permalink
Fix upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
maniackcrudelis committed Apr 24, 2018
1 parent e6c6766 commit 96dbbbe
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 16 deletions.
2 changes: 1 addition & 1 deletion scripts/install
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ ynh_setup_source "$final_path"
#=================================================

virtualenv --system-site-packages "$final_path"
bash -c "source $final_path/bin/activate && pip install -U pip setuptools && pip install --requirement $final_path/requirements-ynh.txt"
bash -c "source $final_path/bin/activate && pip install -U setuptools && pip install --requirement $final_path/requirements-ynh.txt"

#=================================================
# CONFIGURE SEARX
Expand Down
5 changes: 3 additions & 2 deletions scripts/upgrade
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,10 @@ 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-*
rm -r $final_path/lib/python2.7/site-packages/setuptools $final_path/lib/python2.7/site-packages/setuptools-*
rm -rf $final_path/lib/python2.7/site-packages/pip $final_path/lib/python2.7/site-packages/pip-*
virtualenv --system-site-packages "$final_path"
bash -c "source $final_path/bin/activate && pip install -U pip setuptools && pip install --requirement $final_path/requirements-ynh.txt --upgrade"
bash -c "source $final_path/bin/activate && pip install -U setuptools && pip install --requirement $final_path/requirements-ynh.txt --upgrade"

#=================================================
# CONFIGURE SEARX
Expand Down
30 changes: 17 additions & 13 deletions sources/extra_files/app/requirements-ynh.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
certifi==2016.9.26
flask==0.12
flask-babel==0.11.1
# lxml==3.7.1
markupsafe==0.23
ndg-httpsclient==0.4.2
pyasn1==0.1.9
pyasn1-modules==0.0.8
# Have a look to https://github.com/asciimoo/searx/blob/master/requirements.txt for each upgrade of Searx
certifi==2017.11.5
flask==0.12.2
flask-babel==0.11.2
# lxml==4.1.1
idna==2.5
pygments==2.1.3
pyopenssl==16.2.0
python-dateutil==2.5.3
pyyaml==3.11
requests[socks]==2.12.4
cffi>=1.6
pyopenssl==17.4.0
python-dateutil==2.6.1
pyyaml==3.12
requests[socks]==2.18.4

# Additionnals requirements
markupsafe>=0.23
ndg-httpsclient>=0.4.2
pyasn1>=0.1.9
pyasn1-modules>=0.0.8
cffi>=1.6

0 comments on commit 96dbbbe

Please sign in to comment.