From 54e69d0367d69eb3529670f131fa80eac356975b Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Mon, 28 Dec 2020 09:04:39 +0100 Subject: [PATCH] [upd] update dependencies minor change in the oscar theme becase the last version of jinja2 respect more carefully the spaces in the templates --- manage.sh | 2 +- requirements-dev.txt | 15 +++++++-------- requirements.txt | 16 ++++++++-------- searx/templates/oscar/macros.html | 2 +- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/manage.sh b/manage.sh index 78571e45b..bda74545c 100755 --- a/manage.sh +++ b/manage.sh @@ -38,7 +38,7 @@ install_geckodriver() { if [ -z "$NOTFOUND" ]; then return fi - GECKODRIVER_VERSION="v0.24.0" + GECKODRIVER_VERSION="v0.28.0" PLATFORM="`python3 -c "import platform; print(platform.system().lower(), platform.architecture()[0])"`" case "$PLATFORM" in "linux 32bit" | "linux2 32bit") ARCH="linux32";; diff --git a/requirements-dev.txt b/requirements-dev.txt index d0d1ecc95..170f8c1d9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,18 +1,17 @@ -mock==2.0.0 +mock==4.0.3; python_version >= "3.6" +mock==2.0.0; python_version < "3.6" nose2[coverage_plugin]==0.9.2 cov-core==1.15.0 pycodestyle==2.6.0 -pylint==2.4.4 -plone.testing==5.0.0 -splinter==0.11.0 -transifex-client==0.12.2 +pylint==2.6.0 +splinter==0.14.0 +transifex-client==0.14.2 unittest2==1.1.0 -zope.testrunner==4.5.1 selenium==3.141.0 -twine==3.2.0; python_version >= "3.6" +twine==3.3.0; python_version >= "3.6" twine==1.15.0; python_version < "3.6" Pallets-Sphinx-Themes==1.2.3 -Sphinx==3.2.1; python_version >= '3.6' +Sphinx==3.4.1; python_version >= '3.6' Sphinx==3.0.1; python_version < '3.6' sphinx-issues==1.2.0 sphinx-jinja==1.1.1 diff --git a/requirements.txt b/requirements.txt index 51a4fff72..e0c48ca94 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ -certifi==2020.6.20 -babel==2.7.0 -flask-babel==1.0.0 +certifi==2020.12.05 +babel==2.9.0 +flask-babel==2.0.0 flask==1.1.2 idna==2.10 -jinja2==2.11.1 -lxml==4.6.1 +jinja2==2.11.2 +lxml==4.6.2 pygments==2.1.3 -pyopenssl==19.1.0 -python-dateutil==2.8.0 +pyopenssl==20.0.1 +python-dateutil==2.8.1 pyyaml==5.3.1 -requests[socks]==2.24.0 +requests[socks]==2.25.1 diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index f40eebd37..571242860 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -14,7 +14,7 @@ {% macro result_header(result, favicons, id) -%} -

{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }} {% endif %}{% if result.url %}{{ result_link(result.url, result.title|safe, id=id) }}{% else %}{{ result.title|safe}}{% endif %}

+

{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }}{% endif %}{% if result.url %}{{ result_link(result.url, result.title|safe, id=id) }}{% else %}{{ result.title|safe}}{% endif %}

{%- endmacro %}