Merge branch 'searxng:master' into master

devloberto · Aug 4, 2024 · 750dc6a · 750dc6a
2 parents 7f2b06d + e76a4f7
commit 750dc6a
Show file tree

Hide file tree

Showing 156 changed files with 8,974 additions and 6,704 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3.20
 ENTRYPOINT ["/sbin/tini","--","/usr/local/searxng/dockerfiles/docker-entrypoint.sh"]
 EXPOSE 8080
 VOLUME /etc/searxng
@@ -35,7 +35,6 @@ RUN apk add --no-cache -t build-dependencies \
     git \
  && apk add --no-cache \
     ca-certificates \
-    su-exec \
     python3 \
     py3-pip \
     libxml2 \

diff --git a/dockerfiles/docker-entrypoint.sh b/dockerfiles/docker-entrypoint.sh
@@ -175,4 +175,4 @@ unset MORTY_KEY
 
 # Start uwsgi
 printf 'Listen on %s\n' "${BIND_ADDRESS}"
-exec su-exec searxng:searxng uwsgi --master --http-socket "${BIND_ADDRESS}" "${UWSGI_SETTINGS_PATH}"
+exec uwsgi --master --uid searxng --gid searxng --http-socket "${BIND_ADDRESS}" "${UWSGI_SETTINGS_PATH}"
diff --git a/docs/admin/settings/index.rst b/docs/admin/settings/index.rst
@@ -1,3 +1,5 @@
+.. _searxng settings.yml:
+
 ========
 Settings
 ========

diff --git a/docs/dev/engines/engine_overview.rst b/docs/dev/engines/engine_overview.rst
@@ -339,6 +339,8 @@ type.
    content                   *(not implemented yet)*
    publishedDate             :py:class:`datetime.datetime`, time of publish
    thumbnail                 string, url to a small-preview image
+   length                    :py:class:`datetime.timedelta`, duration of result
+   views                     string, view count in humanized number format
    ========================= =====================================================
 
 

diff --git a/docs/dev/engines/online/alpinelinux.rst b/docs/dev/engines/online/alpinelinux.rst
@@ -0,0 +1,13 @@
+.. _alpinelinux engine:
+
+=====================
+Alpine Linux Packages
+=====================
+
+.. contents::
+   :depth: 2
+   :local:
+   :backlinks: entry
+
+.. automodule:: searx.engines.alpinelinux
+   :members:
diff --git a/docs/dev/engines/online/geizhals.rst b/docs/dev/engines/online/geizhals.rst
@@ -0,0 +1,8 @@
+.. _gitea geizhals:
+
+========
+Geizhals
+========
+
+.. automodule:: searx.engines.geizhals
+  :members:
diff --git a/docs/src/searx.settings.rst b/docs/src/searx.settings.rst
@@ -0,0 +1,8 @@
+.. _searx.settings_loader:
+
+===============
+Settings Loader
+===============
+
+.. automodule:: searx.settings_loader
+   :members:
diff --git a/manage b/manage
@@ -54,7 +54,9 @@ fi
 
 YAMLLINT_FILES=()
 while IFS= read -r line; do
-   YAMLLINT_FILES+=("$line")
+    if [ "$line" != "tests/unit/settings/syntaxerror_settings.yml" ]; then
+        YAMLLINT_FILES+=("$line")
+    fi
 done <<< "$(git ls-files './tests/*.yml' './searx/*.yml' './utils/templates/etc/searxng/*.yml')"
 
 RST_FILES=(

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -2,18 +2,18 @@ mock==5.1.0
 nose2[coverage_plugin]==0.15.1
 cov-core==1.15.0
 black==24.3.0
-pylint==3.2.5
+pylint==3.2.6
 splinter==0.21.0
-selenium==4.22.0
+selenium==4.23.1
 Pallets-Sphinx-Themes==2.1.3
 Sphinx<=7.1.2; python_version == '3.8'
-Sphinx==7.3.7; python_version > '3.8'
+Sphinx==7.4.7; python_version > '3.8'
 sphinx-issues==4.1.0
 sphinx-jinja==2.0.2
 sphinx-tabs==3.4.5
 sphinxcontrib-programoutput==0.17
 sphinx-autobuild==2021.3.14
-sphinx-notfound-page==1.0.2
+sphinx-notfound-page==1.0.4
 myst-parser==3.0.1
 linuxdoc==20240509
 aiounittest==1.4.2

diff --git a/requirements.txt b/requirements.txt
@@ -12,7 +12,7 @@ Brotli==1.1.0
 uvloop==0.19.0
 httpx-socks[asyncio]==0.7.7
 setproctitle==1.3.3
-redis==5.0.7
+redis==5.0.8
 markdown-it-py==3.0.0
 fasttext-predict==0.9.2.2
 pytomlpp==1.0.13; python_version < '3.11'