diff --git a/conf/app.src b/conf/app.src index ae5cbd3..be34285 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/asciimoo/searx/archive/v0.14.0.tar.gz -SOURCE_SUM=002c7f9ceeafc5ada2f1fd30b5d5f6c9 +SOURCE_URL=https://github.com/asciimoo/searx/archive/v0.15.0.tar.gz +SOURCE_SUM=fbf7a16ece1e464d69c5a08f5a039a1a SOURCE_SUM_PRG=md5sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/searx.ini b/conf/searx.ini index 5b503d4..25097f8 100644 --- a/conf/searx.ini +++ b/conf/searx.ini @@ -12,7 +12,7 @@ chmod-socket = 666 # Plugin to use and interpretor config single-interpreter = true master = true -plugin = python +plugin = python3 lazy-apps = true enable-threads = true diff --git a/manifest.json b/manifest.json index 62e6426..69d2617 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,7 @@ "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." }, - "version": "0.14.0~ynh1", + "version": "0.15.0~ynh1", "url": "https://asciimoo.github.io/searx/", "license": "AGPL-3.0-or-later", "maintainer": { diff --git a/scripts/install b/scripts/install index 32f2498..cdd619c 100644 --- a/scripts/install +++ b/scripts/install @@ -55,7 +55,7 @@ ynh_app_setting_set $app is_public $is_public # 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 @@ -93,7 +93,7 @@ ynh_setup_source "$final_path" # 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 pip install -U setuptools pip install --requirement $final_path/requirements-ynh.txt diff --git a/scripts/restore b/scripts/restore index 413aa02..017f61b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -54,7 +54,7 @@ ynh_restore_file "$final_path" # 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 diff --git a/scripts/upgrade b/scripts/upgrade index b71f771..8f70898 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -62,7 +62,7 @@ path_url=$(ynh_normalize_url_path $path_url) # 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 @@ -102,8 +102,14 @@ ynh_system_user_create $app # UPGRADE SEARX IN ITS VIRTUALENV #================================================= -rm -r $final_path/lib/python2.7/site-packages/setuptools $final_path/lib/python2.7/site-packages/setuptools-* -virtualenv --system-site-packages "$final_path" +if [ -d $final_path/lib/python2.7 ]; then + # 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 pip install -U setuptools pip install --requirement $final_path/requirements-ynh.txt --upgrade diff --git a/sources/extra_files/app/requirements-ynh.txt b/sources/extra_files/app/requirements-ynh.txt index d0a8eef..76b24ae 100644 --- a/sources/extra_files/app/requirements-ynh.txt +++ b/sources/extra_files/app/requirements-ynh.txt @@ -1,14 +1,14 @@ # 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==1.0.2 flask-babel==0.11.2 -# lxml==4.1.1 -idna==2.5 +# lxml==4.2.3 +idna==2.7 pygments==2.1.3 -pyopenssl==17.4.0 -python-dateutil==2.6.1 -pyyaml==3.12 -requests[socks]==2.18.4 +pyopenssl==18.0.0 +python-dateutil==2.7.3 +pyyaml==3.13 +requests[socks]==2.19.1 # Additionnals requirements markupsafe>=0.23