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...) --- utils/build_env.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'utils/build_env.py') diff --git a/utils/build_env.py b/utils/build_env.py index dc55bd0a8..39708acb9 100644 --- a/utils/build_env.py +++ b/utils/build_env.py @@ -7,6 +7,8 @@ import sys import os from os.path import realpath, dirname, join, sep, abspath +from searx.version import GIT_URL, GIT_BRANCH + repo_root = realpath(dirname(realpath(__file__)) + sep + '..') sys.path.insert(0, repo_root) @@ -30,9 +32,6 @@ def _env(*arg, **kwargs): name_val = [ - ('GIT_URL' , 'brand.git_url'), - ('GIT_BRANCH' , 'brand.git_branch'), - ('SEARX_URL' , 'server.base_url'), ('SEARX_PORT' , 'server.port'), ('SEARX_BIND_ADDRESS' , 'server.bind_address'), @@ -57,8 +56,9 @@ from searx import get_setting print('build %s (settings from: %s)' % (brand_env, os.environ['SEARX_SETTINGS_PATH'])) sys.path.insert(0, repo_root) -from searx import settings with open(repo_root + sep + brand_env, 'w', encoding='utf-8') as f: for name, option in name_val: print("export %s='%s'" % (name, _env(option)), file=f) + print(f"export GIT_URL='{GIT_URL}'", file=f) + print(f"export GIT_BRANCH='{GIT_BRANCH}'", file=f) -- cgit v1.2.3 From 64d64535a2cc894bd9e2e742475cde9d85acb519 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Fri, 30 Jul 2021 08:10:02 +0200 Subject: [fix] buildenv: first unset environment / then import searx package The first import of names from the searx package implies loading the settings.yml. Before this is done, the enviroment variables must be unset to not overwrite the values from the settings.yml Signed-off-by: Markus Heiser --- utils/build_env.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'utils/build_env.py') diff --git a/utils/build_env.py b/utils/build_env.py index 39708acb9..0ff99e99f 100644 --- a/utils/build_env.py +++ b/utils/build_env.py @@ -7,15 +7,12 @@ import sys import os from os.path import realpath, dirname, join, sep, abspath -from searx.version import GIT_URL, GIT_BRANCH - repo_root = realpath(dirname(realpath(__file__)) + sep + '..') sys.path.insert(0, repo_root) -# Under the assumption that a brand is always a fork assure that the settings -# file from reposetorie's working tree is used to generate the build_env, not -# from /etc/searx/settings.yml. -os.environ['SEARX_SETTINGS_PATH'] = abspath(dirname(__file__) + sep + 'settings.yml') +# Assure that the settings file from reposetorie's working tree is used to +# generate the build_env, not from /etc/searx/settings.yml. +os.environ['SEARX_SETTINGS_PATH'] = join(repo_root, 'etc', 'settings.yml') def _env(*arg, **kwargs): val = get_setting(*arg, **kwargs) @@ -49,9 +46,10 @@ for name, option in name_val: if not os.environ.get(name, _unset) is _unset: del os.environ[name] -# After the variables are unset in the environ, we can import settings -# (get_setting) from searx module. +# After the variables are unset in the environ, we can import from the searx +# package (what will read the values from the settings.yml). +from searx.version import GIT_URL, GIT_BRANCH from searx import get_setting print('build %s (settings from: %s)' % (brand_env, os.environ['SEARX_SETTINGS_PATH'])) -- cgit v1.2.3