projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10181-incremental-log'
[arvados.git]
/
sdk
/
cwl
/
gittaggers.py
diff --git
a/sdk/cwl/gittaggers.py
b/sdk/cwl/gittaggers.py
index 3fb0fdecd8fbb646b2a8175169b944e126147a86..8ccb6645de8c78ccf77d3e049fa1b1e6257e5c91 100644
(file)
--- a/
sdk/cwl/gittaggers.py
+++ b/
sdk/cwl/gittaggers.py
@@
-28,6
+28,10
@@
class EggInfoFromGit(egg_info):
If a build tag has already been set (e.g., "egg_info -b", building
from source package), leave it alone.
"""
If a build tag has already been set (e.g., "egg_info -b", building
from source package), leave it alone.
"""
+ def git_latest_tag(self):
+ gitinfo = subprocess.check_output(
+ ['git', 'describe', '--abbrev=0']).strip()
+ return str(gitinfo.decode('utf-8'))
def git_timestamp_tag(self):
gitinfo = subprocess.check_output(
def git_timestamp_tag(self):
gitinfo = subprocess.check_output(
@@
-37,5
+41,5
@@
class EggInfoFromGit(egg_info):
def tags(self):
if self.tag_build is None:
def tags(self):
if self.tag_build is None:
- self.tag_build = self.git_timestamp_tag()
+ self.tag_build = self.git_
latest_tag() + self.git_
timestamp_tag()
return egg_info.tags(self)
return egg_info.tags(self)