From 955eac6d9110717bddcb2f44845130cf22f9f4e2 Mon Sep 17 00:00:00 2001 From: eaidova Date: Mon, 11 Mar 2024 13:49:24 +0400 Subject: [PATCH 1/2] add commit id into dev version setup --- setup.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/setup.py b/setup.py index ac4056c30d..bb36417a71 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,6 @@ +import os import re +import subprocess from setuptools import find_namespace_packages, setup @@ -8,6 +10,18 @@ filepath = "optimum/intel/version.py" with open(filepath) as version_file: (__version__,) = re.findall('__version__ = "(.*)"', version_file.read()) + if __version__.endswith(".dev0"): + dev_version_id = "unknown_version" + try: + repo_root = os.path.dirname(os.path.realpath(__file__)) + dev_version_id = ( + subprocess.check_output(["git", "rev-parse", "--short", "HEAD"], cwd=repo_root) # nosec + .strip() + .decode() + ) + except subprocess.CalledProcessError: + pass + __version__ = __version__ + "+" + dev_version_id except Exception as error: assert False, "Error: Could not open '%s' due %s\n" % (filepath, error) From 400001d66cc6e0dfc84f4df5f5d78cb4879aeb24 Mon Sep 17 00:00:00 2001 From: eaidova Date: Wed, 13 Mar 2024 08:48:35 +0400 Subject: [PATCH 2/2] do not update version if can not get commit --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index bb36417a71..3a1e1123d0 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ with open(filepath) as version_file: (__version__,) = re.findall('__version__ = "(.*)"', version_file.read()) if __version__.endswith(".dev0"): - dev_version_id = "unknown_version" + dev_version_id = "" try: repo_root = os.path.dirname(os.path.realpath(__file__)) dev_version_id = ( @@ -19,9 +19,10 @@ .strip() .decode() ) + dev_version_id = "+" + dev_version_id except subprocess.CalledProcessError: pass - __version__ = __version__ + "+" + dev_version_id + __version__ = __version__ + dev_version_id except Exception as error: assert False, "Error: Could not open '%s' due %s\n" % (filepath, error)