YunoHost-Apps/searx_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/searx_ynh.git synced 2024-09-03 20:16:30 +02:00
Code Issues Activity Actions

Upgrade to upstream v0.15.0 and python3

Browse source
This commit is contained in:
Étienne Deparis 2019-01-07 13:01:02 +01:00
parent 4f84754131
commit b78f22b5c0
7 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/asciimoo/searx/archive/v0.14.0.tar.gz SOURCE_URL=https://github.com/asciimoo/searx/archive/v0.15.0.tar.gz
SOURCE_SUM=002c7f9ceeafc5ada2f1fd30b5d5f6c9 SOURCE_SUM=fbf7a16ece1e464d69c5a08f5a039a1a
SOURCE_SUM_PRG=md5sum SOURCE_SUM_PRG=md5sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

2
conf/searx.ini
View file

@ -12,7 +12,7 @@ chmod-socket = 666
# Plugin to use and interpretor config # Plugin to use and interpretor config
single-interpreter = true single-interpreter = true
master = true master = true
plugin = python plugin = python3
lazy-apps = true lazy-apps = true
enable-threads = true enable-threads = true

2
manifest.json
View file

@ -7,7 +7,7 @@
"fr": "Un méta-moteur de recherche respectueux de la vie privée et bidouillable", "fr": "Un méta-moteur de recherche respectueux de la vie privée et bidouillable",
"de": "Eine Meta-Suchmaschine, die den Privatsphäre wahrt und 'hackable' ist." "de": "Eine Meta-Suchmaschine, die den Privatsphäre wahrt und 'hackable' ist."
}, },
"version": "0.14.0~ynh1", "version": "0.15.0~ynh1",
"url": "https://asciimoo.github.io/searx/", "url": "https://asciimoo.github.io/searx/",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"maintainer": { "maintainer": {

4
scripts/install
View file

@ -55,7 +55,7 @@ ynh_app_setting_set $app is_public $is_public
# INSTALL DEPENDENCIES # INSTALL DEPENDENCIES
#================================================= #=================================================
ynh_install_app_dependencies git build-essential libxslt-dev python-dev python-virtualenv virtualenv python-babel zlib1g-dev libffi-dev libssl-dev python-lxml uwsgi uwsgi-plugin-python ynh_install_app_dependencies git build-essential libxslt-dev python3-dev python3-virtualenv virtualenv python3-babel zlib1g-dev libffi-dev libssl-dev python3-lxml uwsgi uwsgi-plugin-python3
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
@ -93,7 +93,7 @@ ynh_setup_source "$final_path"
# INSTALL SEARX IN A VIRTUALENV # INSTALL SEARX IN A VIRTUALENV
#================================================= #=================================================
virtualenv --system-site-packages "$final_path" virtualenv --python=/usr/bin/python3 --system-site-packages "$final_path"
set +u; source $final_path/bin/activate; set -u set +u; source $final_path/bin/activate; set -u
pip install -U setuptools pip install -U setuptools
pip install --requirement $final_path/requirements-ynh.txt pip install --requirement $final_path/requirements-ynh.txt

2
scripts/restore
View file

@ -54,7 +54,7 @@ ynh_restore_file "$final_path"
# INSTALL DEPENDENCIES # INSTALL DEPENDENCIES
#================================================= #=================================================
ynh_install_app_dependencies git build-essential libxslt-dev python-dev python-virtualenv virtualenv python-babel zlib1g-dev libffi-dev libssl-dev python-lxml uwsgi uwsgi-plugin-python ynh_install_app_dependencies git build-essential libxslt-dev python3-dev python3-virtualenv virtualenv python3-babel zlib1g-dev libffi-dev libssl-dev python3-lxml uwsgi uwsgi-plugin-python3
#================================================= #=================================================
# RECREATE OF THE DEDICATED USER # RECREATE OF THE DEDICATED USER

12
scripts/upgrade
View file

@ -62,7 +62,7 @@ path_url=$(ynh_normalize_url_path $path_url)
# UPGRADE DEPENDENCIES # UPGRADE DEPENDENCIES
#================================================= #=================================================
ynh_install_app_dependencies git build-essential libxslt-dev python-dev python-virtualenv virtualenv python-babel zlib1g-dev libffi-dev libssl-dev python-lxml uwsgi uwsgi-plugin-python ynh_install_app_dependencies git build-essential libxslt-dev python3-dev python3-virtualenv virtualenv python3-babel zlib1g-dev libffi-dev libssl-dev python3-lxml uwsgi uwsgi-plugin-python3
#================================================= #=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE # DOWNLOAD, CHECK AND UNPACK SOURCE
@ -102,8 +102,14 @@ ynh_system_user_create $app
# UPGRADE SEARX IN ITS VIRTUALENV # UPGRADE SEARX IN ITS VIRTUALENV
#================================================= #=================================================
rm -r $final_path/lib/python2.7/site-packages/setuptools $final_path/lib/python2.7/site-packages/setuptools-* if [ -d $final_path/lib/python2.7 ]; then
virtualenv --system-site-packages "$final_path" # The old python2 venv is there, we need to remove it first
rm -r $final_path/bin $final_path/lib $final_path/include
rm $final_path/pip-selfcheck.json
else
rm -r $final_path/lib/python3.5/site-packages/setuptools $final_path/lib/python3.5/site-packages/setuptools-*
fi
virtualenv --python=/usr/bin/python3 --system-site-packages "$final_path"
set +u; source $final_path/bin/activate; set -u set +u; source $final_path/bin/activate; set -u
pip install -U setuptools pip install -U setuptools
pip install --requirement $final_path/requirements-ynh.txt --upgrade pip install --requirement $final_path/requirements-ynh.txt --upgrade

14
sources/extra_files/app/requirements-ynh.txt
View file

@ -1,14 +1,14 @@
# Have a look to https://github.com/asciimoo/searx/blob/master/requirements.txt for each upgrade of Searx # Have a look to https://github.com/asciimoo/searx/blob/master/requirements.txt for each upgrade of Searx
certifi==2017.11.5 certifi==2017.11.5
flask==0.12.2 flask==1.0.2
flask-babel==0.11.2 flask-babel==0.11.2
# lxml==4.1.1 # lxml==4.2.3
idna==2.5 idna==2.7
pygments==2.1.3 pygments==2.1.3
pyopenssl==17.4.0 pyopenssl==18.0.0
python-dateutil==2.6.1 python-dateutil==2.7.3
pyyaml==3.12 pyyaml==3.13
requests[socks]==2.18.4 requests[socks]==2.19.1
# Additionnals requirements # Additionnals requirements
markupsafe>=0.23 markupsafe>=0.23