From 4b43775c91a3c2ef415527edb4b3c041859453b4 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Tue, 27 Jul 2021 18:37:46 +0200 Subject: version based on the git repository This commit remove the need to update the brand for GIT_URL and GIT_BRANCH: there are read from the git repository. It is possible to call python -m searx.version freeze to freeze the current version. Useful when the code is installed outside git (distro package, docker, etc...) --- docs/conf.py | 4 +--- docs/dev/makefile.rst | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/conf.py b/docs/conf.py index 04c8aa205..978d6a660 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -5,7 +5,7 @@ import sys, os from pallets_sphinx_themes import ProjectLink from searx import get_setting -from searx.version import VERSION_STRING +from searx.version import VERSION_STRING, GIT_URL, GIT_BRANCH # Project -------------------------------------------------------------- @@ -15,8 +15,6 @@ author = u'Adam Tauber' release, version = VERSION_STRING, VERSION_STRING SEARX_URL = get_setting('server.base_url') or 'https://example.org/searx' -GIT_URL = get_setting('brand.git_url') -GIT_BRANCH = get_setting('brand.git_branch') ISSUE_URL = get_setting('brand.issue_url') DOCS_URL = get_setting('brand.docs_url') PUBLIC_INSTANCES = get_setting('brand.public_instances') diff --git a/docs/dev/makefile.rst b/docs/dev/makefile.rst index 5bf3c13b2..0b5af3cd8 100644 --- a/docs/dev/makefile.rst +++ b/docs/dev/makefile.rst @@ -107,8 +107,8 @@ The ``make buildenv`` target will update the *build environment* in: Tasks running outside of an *installed instance*, need the following settings from the YAML configuration: -- ``GIT_URL`` from :ref:`brand.git_url ` -- ``GIT_BRANCH`` from :ref:`brand.git_branch ` +- ``GIT_URL`` from git configuration +- ``GIT_BRANCH`` from git configuration - ``SEARX_URL`` from :ref:`server.base_url ` (aka ``PUBLIC_URL``) -- cgit v1.2.3