Merge branch 'add-build-id-for-package-ver' into 'master'

Added pipeline iid as a build id for package version

See merge request !4

.gitlab-ci.yml

+variables:
+  BUILD_TAG: $CI_COMMIT_TAG
+  BUILD_COMMIT_SHORT_SHA: $CI_COMMIT_SHORT_SHA
+  BUILD_ID: $CI_PIPELINE_IID
+
 default:
   image: python:3.6-slim-buster
 

setup.py

@@ -25,7 +25,7 @@ def get_version_from_file():
         return fh.read().strip()
 
 def prepare_version():
-    version = os.getenv("CI_COMMIT_TAG", '')
+    version = os.getenv("BUILD_TAG", '')
 
     if version.startswith('v'):
         # release tag version, e.g. v0.9.0
@@ -33,8 +33,9 @@ def prepare_version():
     else:
         # we assume that it is commit version
         # https://packaging.python.org/guides/distributing-packages-using-setuptools/#local-version-identifiers
-        commit = os.environ["CI_COMMIT_SHORT_SHA"]
-        version = f"{get_version_from_file()}.dev+{commit}"
+        commit = os.environ["BUILD_COMMIT_SHORT_SHA"]
+        build_id = os.environ["BUILD_ID"]
+        version = f"{get_version_from_file()}.dev{build_id}+{commit}"
 
     return version