zaclys
/
searxng
mirror of https://github.com/searxng/searxng.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2117 from dalf/fix_version_number 

Version number follows PEP440 : replace - by +
This commit is contained in:
Alexandre Flament 2023-01-20 10:17:08 +01:00 committed by GitHub
parent 6d72ef3cbe 0515f2974b
commit eed9b09d98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
searx/version.py
View File

@ -59,7 +59,7 @@ def get_git_url_and_branch():
def get_git_version(): def get_git_version():
git_commit_date_hash = subprocess_run(r"git show -s --date='format:%Y.%m.%d' --format='%cd-%h'") git_commit_date_hash = subprocess_run(r"git show -s --date='format:%Y.%m.%d' --format='%cd+%h'")
tag_version = git_version = git_commit_date_hash tag_version = git_version = git_commit_date_hash
# add "-dirty" suffix if there are uncommited changes except searx/settings.yml # add "-dirty" suffix if there are uncommited changes except searx/settings.yml
@ -67,7 +67,7 @@ def get_git_version():
subprocess_run("git diff --quiet -- . ':!searx/settings.yml' ':!utils/brand.env'") subprocess_run("git diff --quiet -- . ':!searx/settings.yml' ':!utils/brand.env'")
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
if e.returncode == 1: if e.returncode == 1:
git_version += "-dirty" git_version += "+dirty"
else: else:
logger.warning('"%s" returns an unexpected return code %i', e.returncode, e.cmd) logger.warning('"%s" returns an unexpected return code %i', e.returncode, e.cmd)
return git_version, tag_version return git_version, tag_version