From 281339caa350a77c205af38c6df32f7d9b9dd71e Mon Sep 17 00:00:00 2001 From: Nicolas Gelot Date: Tue, 12 Sep 2023 17:59:57 +0200 Subject: [PATCH 1/2] Update default search engines This patch disables google, qwant and duckduckgo as search engines. Then it enables mojeek, bing and start page instead. Ref: https://gitlab.e.foundation/e/infra/backlog/-/issues/2112 --- searx/settings.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/searx/settings.yml b/searx/settings.yml index 8abd87850..05375f627 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -313,7 +313,6 @@ engines: - name: bing engine: bing shortcut: bi - disabled: true - name: bing images engine: bing_images @@ -507,6 +506,7 @@ engines: - name: duckduckgo engine: duckduckgo shortcut: ddg + disabled : true - name: duckduckgo images engine: duckduckgo_images @@ -672,6 +672,7 @@ engines: - name: google engine: google shortcut: go + disabled : true # additional_tests: # android: *test_android @@ -778,7 +779,6 @@ engines: engine : imdb shortcut : imdb timeout : 6.0 - disabled : True - name: ina engine: ina @@ -1133,7 +1133,7 @@ engines: engine: qwant shortcut: qw categories: [general, web] - disabled: false + disabled: true additional_tests: rosebud: *test_rosebud @@ -1285,7 +1285,6 @@ engines: engine: startpage shortcut: sp timeout: 6.0 - disabled: true additional_tests: rosebud: *test_rosebud disabled: True @@ -1621,7 +1620,6 @@ engines: suggestion_xpath: //div[@class="top-info"]/p[@class="top-info spell"]/em/a first_page_num: 0 page_size: 10 - disabled: true about: website: https://www.mojeek.com/ wikidata_id: Q60747299 -- GitLab From 47cf4fbe161582b69548fbbdf5c6c99f6d6200d8 Mon Sep 17 00:00:00 2001 From: Nicolas Gelot Date: Wed, 13 Sep 2023 09:03:34 +0200 Subject: [PATCH 2/2] Update requirements --- requirements-dev.txt | 21 +++++++++++---------- requirements.txt | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 9706862b9..a9788350a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,22 +1,23 @@ -mock==5.0.2 -nose2[coverage_plugin]==0.12.0 +mock==5.1.0 +nose2[coverage_plugin]==0.13.0 cov-core==1.15.0 black==22.12.0 -pylint==2.17.2 +pylint==2.17.5 splinter==0.19.0 -selenium==4.9.0 +selenium==4.12.0 twine==4.0.2 -Pallets-Sphinx-Themes==2.0.3 -Sphinx==5.3.0 +Pallets-Sphinx-Themes==2.1.1 +Sphinx<=7.1.2; python_version == '3.8' +Sphinx==7.2.5; python_version > '3.8' sphinx-issues==3.0.1 sphinx-jinja==2.0.2 sphinx-tabs==3.4.1 sphinxcontrib-programoutput==0.17 sphinx-autobuild==2021.3.14 -sphinx-notfound-page==0.8.3 -myst-parser==1.0.0 -linuxdoc==20230321 +sphinx-notfound-page==1.0.0 +myst-parser==2.0.0 +linuxdoc==20230827 aiounittest==1.4.2 -yamllint==1.30.0 +yamllint==1.32.0 wlc==1.13 coloredlogs==15.0.1 diff --git a/requirements.txt b/requirements.txt index 4ff3cabf0..8b5d3fa44 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1,19 @@ -certifi==2022.12.7 +certifi==2023.7.22 babel==2.12.1 flask-babel==3.1.0 -flask==2.2.3 +flask==2.3.3 jinja2==3.1.2 -lxml==4.9.2 -pygments==2.15.1 +lxml==4.9.3 +pygments==2.16.1 python-dateutil==2.8.2 -pyyaml==6.0 -httpx[http2]==0.21.2 -Brotli==1.0.9 +pyyaml==6.0.1 +httpx[http2]==0.24.1 +Brotli==1.1.0 uvloop==0.17.0 -httpx-socks[asyncio]==0.7.2 +httpx-socks[asyncio]==0.7.7 setproctitle==1.3.2 -redis==4.5.4 -markdown-it-py==2.2.0 -typing_extensions==4.5.0 +redis==4.6.0 +markdown-it-py==3.0.0 +typing_extensions==4.7.1 fasttext-predict==0.9.2.1 sentry-sdk[flask]==1.5.12 -- GitLab