|
|
@ -25,10 +25,10 @@ def get_keywords():
|
|
|
|
# setup.py/versioneer.py will grep for the variable names, so they must
|
|
|
|
# setup.py/versioneer.py will grep for the variable names, so they must
|
|
|
|
# each be defined on a line of their own. _version.py will just call
|
|
|
|
# each be defined on a line of their own. _version.py will just call
|
|
|
|
# get_keywords().
|
|
|
|
# get_keywords().
|
|
|
|
git_refnames = '$Format:%d$'
|
|
|
|
git_refnames = "$Format:%d$"
|
|
|
|
git_full = '$Format:%H$'
|
|
|
|
git_full = "$Format:%H$"
|
|
|
|
git_date = '$Format:%ci$'
|
|
|
|
git_date = "$Format:%ci$"
|
|
|
|
keywords = {'refnames': git_refnames, 'full': git_full, 'date': git_date}
|
|
|
|
keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
|
|
|
|
return keywords
|
|
|
|
return keywords
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -41,11 +41,11 @@ def get_config():
|
|
|
|
# these strings are filled in when 'setup.py versioneer' creates
|
|
|
|
# these strings are filled in when 'setup.py versioneer' creates
|
|
|
|
# _version.py
|
|
|
|
# _version.py
|
|
|
|
cfg = VersioneerConfig()
|
|
|
|
cfg = VersioneerConfig()
|
|
|
|
cfg.VCS = 'git'
|
|
|
|
cfg.VCS = "git"
|
|
|
|
cfg.style = 'pep440'
|
|
|
|
cfg.style = "pep440"
|
|
|
|
cfg.tag_prefix = ''
|
|
|
|
cfg.tag_prefix = ""
|
|
|
|
cfg.parentdir_prefix = ''
|
|
|
|
cfg.parentdir_prefix = ""
|
|
|
|
cfg.versionfile_source = 'mipac/_version.py'
|
|
|
|
cfg.versionfile_source = "mipac/_version.py"
|
|
|
|
cfg.verbose = False
|
|
|
|
cfg.verbose = False
|
|
|
|
return cfg
|
|
|
|
return cfg
|
|
|
|
|
|
|
|
|
|
|
@ -60,61 +60,54 @@ HANDLERS: Dict[str, Dict[str, Callable]] = {}
|
|
|
|
|
|
|
|
|
|
|
|
def register_vcs_handler(vcs, method): # decorator
|
|
|
|
def register_vcs_handler(vcs, method): # decorator
|
|
|
|
"""Create decorator to mark a method as the handler of a VCS."""
|
|
|
|
"""Create decorator to mark a method as the handler of a VCS."""
|
|
|
|
|
|
|
|
|
|
|
|
def decorate(f):
|
|
|
|
def decorate(f):
|
|
|
|
"""Store f in HANDLERS[vcs][method]."""
|
|
|
|
"""Store f in HANDLERS[vcs][method]."""
|
|
|
|
if vcs not in HANDLERS:
|
|
|
|
if vcs not in HANDLERS:
|
|
|
|
HANDLERS[vcs] = {}
|
|
|
|
HANDLERS[vcs] = {}
|
|
|
|
HANDLERS[vcs][method] = f
|
|
|
|
HANDLERS[vcs][method] = f
|
|
|
|
return f
|
|
|
|
return f
|
|
|
|
|
|
|
|
|
|
|
|
return decorate
|
|
|
|
return decorate
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def run_command(
|
|
|
|
def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
|
|
|
|
commands, args, cwd=None, verbose=False, hide_stderr=False, env=None
|
|
|
|
env=None):
|
|
|
|
):
|
|
|
|
|
|
|
|
"""Call the given command(s)."""
|
|
|
|
"""Call the given command(s)."""
|
|
|
|
assert isinstance(commands, list)
|
|
|
|
assert isinstance(commands, list)
|
|
|
|
process = None
|
|
|
|
process = None
|
|
|
|
|
|
|
|
|
|
|
|
popen_kwargs = {}
|
|
|
|
popen_kwargs = {}
|
|
|
|
if sys.platform == 'win32':
|
|
|
|
if sys.platform == "win32":
|
|
|
|
# This hides the console window if pythonw.exe is used
|
|
|
|
# This hides the console window if pythonw.exe is used
|
|
|
|
startupinfo = subprocess.STARTUPINFO()
|
|
|
|
startupinfo = subprocess.STARTUPINFO()
|
|
|
|
startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
|
|
|
|
startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
|
|
|
|
popen_kwargs['startupinfo'] = startupinfo
|
|
|
|
popen_kwargs["startupinfo"] = startupinfo
|
|
|
|
|
|
|
|
|
|
|
|
for command in commands:
|
|
|
|
for command in commands:
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
dispcmd = str([command] + args)
|
|
|
|
dispcmd = str([command] + args)
|
|
|
|
# remember shell=False, so use git.cmd on windows, not just git
|
|
|
|
# remember shell=False, so use git.cmd on windows, not just git
|
|
|
|
process = subprocess.Popen(
|
|
|
|
process = subprocess.Popen([command] + args, cwd=cwd, env=env,
|
|
|
|
[command] + args,
|
|
|
|
|
|
|
|
cwd=cwd,
|
|
|
|
|
|
|
|
env=env,
|
|
|
|
|
|
|
|
stdout=subprocess.PIPE,
|
|
|
|
stdout=subprocess.PIPE,
|
|
|
|
stderr=(subprocess.PIPE if hide_stderr else None),
|
|
|
|
stderr=(subprocess.PIPE if hide_stderr
|
|
|
|
**popen_kwargs,
|
|
|
|
else None), **popen_kwargs)
|
|
|
|
)
|
|
|
|
|
|
|
|
break
|
|
|
|
break
|
|
|
|
except OSError:
|
|
|
|
except OSError:
|
|
|
|
e = sys.exc_info()[1]
|
|
|
|
e = sys.exc_info()[1]
|
|
|
|
if e.errno == errno.ENOENT:
|
|
|
|
if e.errno == errno.ENOENT:
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
if verbose:
|
|
|
|
if verbose:
|
|
|
|
print('unable to run %s' % dispcmd)
|
|
|
|
print("unable to run %s" % dispcmd)
|
|
|
|
print(e)
|
|
|
|
print(e)
|
|
|
|
return None, None
|
|
|
|
return None, None
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
if verbose:
|
|
|
|
if verbose:
|
|
|
|
print('unable to find command, tried %s' % (commands,))
|
|
|
|
print("unable to find command, tried %s" % (commands,))
|
|
|
|
return None, None
|
|
|
|
return None, None
|
|
|
|
stdout = process.communicate()[0].strip().decode()
|
|
|
|
stdout = process.communicate()[0].strip().decode()
|
|
|
|
if process.returncode != 0:
|
|
|
|
if process.returncode != 0:
|
|
|
|
if verbose:
|
|
|
|
if verbose:
|
|
|
|
print('unable to run %s (error)' % dispcmd)
|
|
|
|
print("unable to run %s (error)" % dispcmd)
|
|
|
|
print('stdout was %s' % stdout)
|
|
|
|
print("stdout was %s" % stdout)
|
|
|
|
return None, process.returncode
|
|
|
|
return None, process.returncode
|
|
|
|
return stdout, process.returncode
|
|
|
|
return stdout, process.returncode
|
|
|
|
|
|
|
|
|
|
|
@ -131,25 +124,19 @@ def versions_from_parentdir(parentdir_prefix, root, verbose):
|
|
|
|
for _ in range(3):
|
|
|
|
for _ in range(3):
|
|
|
|
dirname = os.path.basename(root)
|
|
|
|
dirname = os.path.basename(root)
|
|
|
|
if dirname.startswith(parentdir_prefix):
|
|
|
|
if dirname.startswith(parentdir_prefix):
|
|
|
|
return {
|
|
|
|
return {"version": dirname[len(parentdir_prefix):],
|
|
|
|
'version': dirname[len(parentdir_prefix) :],
|
|
|
|
"full-revisionid": None,
|
|
|
|
'full-revisionid': None,
|
|
|
|
"dirty": False, "error": None, "date": None}
|
|
|
|
'dirty': False,
|
|
|
|
|
|
|
|
'error': None,
|
|
|
|
|
|
|
|
'date': None,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
rootdirs.append(root)
|
|
|
|
rootdirs.append(root)
|
|
|
|
root = os.path.dirname(root) # up a level
|
|
|
|
root = os.path.dirname(root) # up a level
|
|
|
|
|
|
|
|
|
|
|
|
if verbose:
|
|
|
|
if verbose:
|
|
|
|
print(
|
|
|
|
print("Tried directories %s but none started with prefix %s" %
|
|
|
|
'Tried directories %s but none started with prefix %s'
|
|
|
|
(str(rootdirs), parentdir_prefix))
|
|
|
|
% (str(rootdirs), parentdir_prefix)
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
|
|
|
|
raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@register_vcs_handler('git', 'get_keywords')
|
|
|
|
@register_vcs_handler("git", "get_keywords")
|
|
|
|
def git_get_keywords(versionfile_abs):
|
|
|
|
def git_get_keywords(versionfile_abs):
|
|
|
|
"""Extract version information from the given file."""
|
|
|
|
"""Extract version information from the given file."""
|
|
|
|
# the code embedded in _version.py can just fetch the value of these
|
|
|
|
# the code embedded in _version.py can just fetch the value of these
|
|
|
@ -158,31 +145,31 @@ def git_get_keywords(versionfile_abs):
|
|
|
|
# _version.py.
|
|
|
|
# _version.py.
|
|
|
|
keywords = {}
|
|
|
|
keywords = {}
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
with open(versionfile_abs, 'r') as fobj:
|
|
|
|
with open(versionfile_abs, "r") as fobj:
|
|
|
|
for line in fobj:
|
|
|
|
for line in fobj:
|
|
|
|
if line.strip().startswith('git_refnames ='):
|
|
|
|
if line.strip().startswith("git_refnames ="):
|
|
|
|
mo = re.search(r'=\s*"(.*)"', line)
|
|
|
|
mo = re.search(r'=\s*"(.*)"', line)
|
|
|
|
if mo:
|
|
|
|
if mo:
|
|
|
|
keywords['refnames'] = mo.group(1)
|
|
|
|
keywords["refnames"] = mo.group(1)
|
|
|
|
if line.strip().startswith('git_full ='):
|
|
|
|
if line.strip().startswith("git_full ="):
|
|
|
|
mo = re.search(r'=\s*"(.*)"', line)
|
|
|
|
mo = re.search(r'=\s*"(.*)"', line)
|
|
|
|
if mo:
|
|
|
|
if mo:
|
|
|
|
keywords['full'] = mo.group(1)
|
|
|
|
keywords["full"] = mo.group(1)
|
|
|
|
if line.strip().startswith('git_date ='):
|
|
|
|
if line.strip().startswith("git_date ="):
|
|
|
|
mo = re.search(r'=\s*"(.*)"', line)
|
|
|
|
mo = re.search(r'=\s*"(.*)"', line)
|
|
|
|
if mo:
|
|
|
|
if mo:
|
|
|
|
keywords['date'] = mo.group(1)
|
|
|
|
keywords["date"] = mo.group(1)
|
|
|
|
except OSError:
|
|
|
|
except OSError:
|
|
|
|
pass
|
|
|
|
pass
|
|
|
|
return keywords
|
|
|
|
return keywords
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@register_vcs_handler('git', 'keywords')
|
|
|
|
@register_vcs_handler("git", "keywords")
|
|
|
|
def git_versions_from_keywords(keywords, tag_prefix, verbose):
|
|
|
|
def git_versions_from_keywords(keywords, tag_prefix, verbose):
|
|
|
|
"""Get version information from git keywords."""
|
|
|
|
"""Get version information from git keywords."""
|
|
|
|
if 'refnames' not in keywords:
|
|
|
|
if "refnames" not in keywords:
|
|
|
|
raise NotThisMethod('Short version file found')
|
|
|
|
raise NotThisMethod("Short version file found")
|
|
|
|
date = keywords.get('date')
|
|
|
|
date = keywords.get("date")
|
|
|
|
if date is not None:
|
|
|
|
if date is not None:
|
|
|
|
# Use only the last line. Previous lines may contain GPG signature
|
|
|
|
# Use only the last line. Previous lines may contain GPG signature
|
|
|
|
# information.
|
|
|
|
# information.
|
|
|
@ -194,16 +181,16 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
|
|
|
|
# it's been around since git-1.5.3, and it's too difficult to
|
|
|
|
# it's been around since git-1.5.3, and it's too difficult to
|
|
|
|
# discover which version we're using, or to work around using an
|
|
|
|
# discover which version we're using, or to work around using an
|
|
|
|
# older one.
|
|
|
|
# older one.
|
|
|
|
date = date.strip().replace(' ', 'T', 1).replace(' ', '', 1)
|
|
|
|
date = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
|
|
|
|
refnames = keywords['refnames'].strip()
|
|
|
|
refnames = keywords["refnames"].strip()
|
|
|
|
if refnames.startswith('$Format'):
|
|
|
|
if refnames.startswith("$Format"):
|
|
|
|
if verbose:
|
|
|
|
if verbose:
|
|
|
|
print('keywords are unexpanded, not using')
|
|
|
|
print("keywords are unexpanded, not using")
|
|
|
|
raise NotThisMethod('unexpanded keywords, not a git-archive tarball')
|
|
|
|
raise NotThisMethod("unexpanded keywords, not a git-archive tarball")
|
|
|
|
refs = {r.strip() for r in refnames.strip('()').split(',')}
|
|
|
|
refs = {r.strip() for r in refnames.strip("()").split(",")}
|
|
|
|
# starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
|
|
|
|
# starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
|
|
|
|
# just "foo-1.0". If we see a "tag: " prefix, prefer those.
|
|
|
|
# just "foo-1.0". If we see a "tag: " prefix, prefer those.
|
|
|
|
TAG = 'tag: '
|
|
|
|
TAG = "tag: "
|
|
|
|
tags = {r[len(TAG):] for r in refs if r.startswith(TAG)}
|
|
|
|
tags = {r[len(TAG):] for r in refs if r.startswith(TAG)}
|
|
|
|
if not tags:
|
|
|
|
if not tags:
|
|
|
|
# Either we're using git < 1.8.3, or there really are no tags. We use
|
|
|
|
# Either we're using git < 1.8.3, or there really are no tags. We use
|
|
|
@ -215,9 +202,9 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
|
|
|
|
# "stabilization", as well as "HEAD" and "master".
|
|
|
|
# "stabilization", as well as "HEAD" and "master".
|
|
|
|
tags = {r for r in refs if re.search(r'\d', r)}
|
|
|
|
tags = {r for r in refs if re.search(r'\d', r)}
|
|
|
|
if verbose:
|
|
|
|
if verbose:
|
|
|
|
print("discarding '%s', no digits" % ','.join(refs - tags))
|
|
|
|
print("discarding '%s', no digits" % ",".join(refs - tags))
|
|
|
|
if verbose:
|
|
|
|
if verbose:
|
|
|
|
print('likely tags: %s' % ','.join(sorted(tags)))
|
|
|
|
print("likely tags: %s" % ",".join(sorted(tags)))
|
|
|
|
for ref in sorted(tags):
|
|
|
|
for ref in sorted(tags):
|
|
|
|
# sorting will prefer e.g. "2.0" over "2.0rc1"
|
|
|
|
# sorting will prefer e.g. "2.0" over "2.0rc1"
|
|
|
|
if ref.startswith(tag_prefix):
|
|
|
|
if ref.startswith(tag_prefix):
|
|
|
@ -228,27 +215,20 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
|
|
|
|
if not re.match(r'\d', r):
|
|
|
|
if not re.match(r'\d', r):
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
if verbose:
|
|
|
|
if verbose:
|
|
|
|
print('picking %s' % r)
|
|
|
|
print("picking %s" % r)
|
|
|
|
return {
|
|
|
|
return {"version": r,
|
|
|
|
'version': r,
|
|
|
|
"full-revisionid": keywords["full"].strip(),
|
|
|
|
'full-revisionid': keywords['full'].strip(),
|
|
|
|
"dirty": False, "error": None,
|
|
|
|
'dirty': False,
|
|
|
|
"date": date}
|
|
|
|
'error': None,
|
|
|
|
|
|
|
|
'date': date,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
# no suitable tags, so version is "0+unknown", but full hex is still there
|
|
|
|
# no suitable tags, so version is "0+unknown", but full hex is still there
|
|
|
|
if verbose:
|
|
|
|
if verbose:
|
|
|
|
print('no suitable tags, using unknown + full revision id')
|
|
|
|
print("no suitable tags, using unknown + full revision id")
|
|
|
|
return {
|
|
|
|
return {"version": "0+unknown",
|
|
|
|
'version': '0+unknown',
|
|
|
|
"full-revisionid": keywords["full"].strip(),
|
|
|
|
'full-revisionid': keywords['full'].strip(),
|
|
|
|
"dirty": False, "error": "no suitable tags", "date": None}
|
|
|
|
'dirty': False,
|
|
|
|
|
|
|
|
'error': 'no suitable tags',
|
|
|
|
|
|
|
|
'date': None,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@register_vcs_handler('git', 'pieces_from_vcs')
|
|
|
|
@register_vcs_handler("git", "pieces_from_vcs")
|
|
|
|
def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
|
|
|
|
def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
|
|
|
|
"""Get version from 'git describe' in the root of the source tree.
|
|
|
|
"""Get version from 'git describe' in the root of the source tree.
|
|
|
|
|
|
|
|
|
|
|
@ -256,108 +236,96 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
|
|
|
|
expanded, and _version.py hasn't already been rewritten with a short
|
|
|
|
expanded, and _version.py hasn't already been rewritten with a short
|
|
|
|
version string, meaning we're inside a checked out source tree.
|
|
|
|
version string, meaning we're inside a checked out source tree.
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
GITS = ['git']
|
|
|
|
GITS = ["git"]
|
|
|
|
if sys.platform == 'win32':
|
|
|
|
if sys.platform == "win32":
|
|
|
|
GITS = ['git.cmd', 'git.exe']
|
|
|
|
GITS = ["git.cmd", "git.exe"]
|
|
|
|
|
|
|
|
|
|
|
|
# GIT_DIR can interfere with correct operation of Versioneer.
|
|
|
|
# GIT_DIR can interfere with correct operation of Versioneer.
|
|
|
|
# It may be intended to be passed to the Versioneer-versioned project,
|
|
|
|
# It may be intended to be passed to the Versioneer-versioned project,
|
|
|
|
# but that should not change where we get our version from.
|
|
|
|
# but that should not change where we get our version from.
|
|
|
|
env = os.environ.copy()
|
|
|
|
env = os.environ.copy()
|
|
|
|
env.pop('GIT_DIR', None)
|
|
|
|
env.pop("GIT_DIR", None)
|
|
|
|
runner = functools.partial(runner, env=env)
|
|
|
|
runner = functools.partial(runner, env=env)
|
|
|
|
|
|
|
|
|
|
|
|
_, rc = runner(
|
|
|
|
_, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root,
|
|
|
|
GITS, ['rev-parse', '--git-dir'], cwd=root, hide_stderr=not verbose
|
|
|
|
hide_stderr=not verbose)
|
|
|
|
)
|
|
|
|
|
|
|
|
if rc != 0:
|
|
|
|
if rc != 0:
|
|
|
|
if verbose:
|
|
|
|
if verbose:
|
|
|
|
print('Directory %s not under git control' % root)
|
|
|
|
print("Directory %s not under git control" % root)
|
|
|
|
raise NotThisMethod("'git rev-parse --git-dir' returned error")
|
|
|
|
raise NotThisMethod("'git rev-parse --git-dir' returned error")
|
|
|
|
|
|
|
|
|
|
|
|
# if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
|
|
|
|
# if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
|
|
|
|
# if there isn't one, this yields HEX[-dirty] (no NUM)
|
|
|
|
# if there isn't one, this yields HEX[-dirty] (no NUM)
|
|
|
|
describe_out, rc = runner(
|
|
|
|
describe_out, rc = runner(GITS, [
|
|
|
|
GITS,
|
|
|
|
"describe", "--tags", "--dirty", "--always", "--long",
|
|
|
|
[
|
|
|
|
"--match", f"{tag_prefix}[[:digit:]]*"
|
|
|
|
'describe',
|
|
|
|
], cwd=root)
|
|
|
|
'--tags',
|
|
|
|
|
|
|
|
'--dirty',
|
|
|
|
|
|
|
|
'--always',
|
|
|
|
|
|
|
|
'--long',
|
|
|
|
|
|
|
|
'--match',
|
|
|
|
|
|
|
|
f'{tag_prefix}[[:digit:]]*',
|
|
|
|
|
|
|
|
],
|
|
|
|
|
|
|
|
cwd=root,
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
# --long was added in git-1.5.5
|
|
|
|
# --long was added in git-1.5.5
|
|
|
|
if describe_out is None:
|
|
|
|
if describe_out is None:
|
|
|
|
raise NotThisMethod("'git describe' failed")
|
|
|
|
raise NotThisMethod("'git describe' failed")
|
|
|
|
describe_out = describe_out.strip()
|
|
|
|
describe_out = describe_out.strip()
|
|
|
|
full_out, rc = runner(GITS, ['rev-parse', 'HEAD'], cwd=root)
|
|
|
|
full_out, rc = runner(GITS, ["rev-parse", "HEAD"], cwd=root)
|
|
|
|
if full_out is None:
|
|
|
|
if full_out is None:
|
|
|
|
raise NotThisMethod("'git rev-parse' failed")
|
|
|
|
raise NotThisMethod("'git rev-parse' failed")
|
|
|
|
full_out = full_out.strip()
|
|
|
|
full_out = full_out.strip()
|
|
|
|
|
|
|
|
|
|
|
|
pieces = {}
|
|
|
|
pieces = {}
|
|
|
|
pieces['long'] = full_out
|
|
|
|
pieces["long"] = full_out
|
|
|
|
pieces['short'] = full_out[:7] # maybe improved later
|
|
|
|
pieces["short"] = full_out[:7] # maybe improved later
|
|
|
|
pieces['error'] = None
|
|
|
|
pieces["error"] = None
|
|
|
|
|
|
|
|
|
|
|
|
branch_name, rc = runner(
|
|
|
|
branch_name, rc = runner(GITS, ["rev-parse", "--abbrev-ref", "HEAD"],
|
|
|
|
GITS, ['rev-parse', '--abbrev-ref', 'HEAD'], cwd=root
|
|
|
|
cwd=root)
|
|
|
|
)
|
|
|
|
|
|
|
|
# --abbrev-ref was added in git-1.6.3
|
|
|
|
# --abbrev-ref was added in git-1.6.3
|
|
|
|
if rc != 0 or branch_name is None:
|
|
|
|
if rc != 0 or branch_name is None:
|
|
|
|
raise NotThisMethod("'git rev-parse --abbrev-ref' returned error")
|
|
|
|
raise NotThisMethod("'git rev-parse --abbrev-ref' returned error")
|
|
|
|
branch_name = branch_name.strip()
|
|
|
|
branch_name = branch_name.strip()
|
|
|
|
|
|
|
|
|
|
|
|
if branch_name == 'HEAD':
|
|
|
|
if branch_name == "HEAD":
|
|
|
|
# If we aren't exactly on a branch, pick a branch which represents
|
|
|
|
# If we aren't exactly on a branch, pick a branch which represents
|
|
|
|
# the current commit. If all else fails, we are on a branchless
|
|
|
|
# the current commit. If all else fails, we are on a branchless
|
|
|
|
# commit.
|
|
|
|
# commit.
|
|
|
|
branches, rc = runner(GITS, ['branch', '--contains'], cwd=root)
|
|
|
|
branches, rc = runner(GITS, ["branch", "--contains"], cwd=root)
|
|
|
|
# --contains was added in git-1.5.4
|
|
|
|
# --contains was added in git-1.5.4
|
|
|
|
if rc != 0 or branches is None:
|
|
|
|
if rc != 0 or branches is None:
|
|
|
|
raise NotThisMethod("'git branch --contains' returned error")
|
|
|
|
raise NotThisMethod("'git branch --contains' returned error")
|
|
|
|
branches = branches.split('\n')
|
|
|
|
branches = branches.split("\n")
|
|
|
|
|
|
|
|
|
|
|
|
# Remove the first line if we're running detached
|
|
|
|
# Remove the first line if we're running detached
|
|
|
|
if '(' in branches[0]:
|
|
|
|
if "(" in branches[0]:
|
|
|
|
branches.pop(0)
|
|
|
|
branches.pop(0)
|
|
|
|
|
|
|
|
|
|
|
|
# Strip off the leading "* " from the list of branches.
|
|
|
|
# Strip off the leading "* " from the list of branches.
|
|
|
|
branches = [branch[2:] for branch in branches]
|
|
|
|
branches = [branch[2:] for branch in branches]
|
|
|
|
if 'master' in branches:
|
|
|
|
if "master" in branches:
|
|
|
|
branch_name = 'master'
|
|
|
|
branch_name = "master"
|
|
|
|
elif not branches:
|
|
|
|
elif not branches:
|
|
|
|
branch_name = None
|
|
|
|
branch_name = None
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
# Pick the first branch that is returned. Good or bad.
|
|
|
|
# Pick the first branch that is returned. Good or bad.
|
|
|
|
branch_name = branches[0]
|
|
|
|
branch_name = branches[0]
|
|
|
|
|
|
|
|
|
|
|
|
pieces['branch'] = branch_name
|
|
|
|
pieces["branch"] = branch_name
|
|
|
|
|
|
|
|
|
|
|
|
# parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty]
|
|
|
|
# parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty]
|
|
|
|
# TAG might have hyphens.
|
|
|
|
# TAG might have hyphens.
|
|
|
|
git_describe = describe_out
|
|
|
|
git_describe = describe_out
|
|
|
|
|
|
|
|
|
|
|
|
# look for -dirty suffix
|
|
|
|
# look for -dirty suffix
|
|
|
|
dirty = git_describe.endswith('-dirty')
|
|
|
|
dirty = git_describe.endswith("-dirty")
|
|
|
|
pieces['dirty'] = dirty
|
|
|
|
pieces["dirty"] = dirty
|
|
|
|
if dirty:
|
|
|
|
if dirty:
|
|
|
|
git_describe = git_describe[: git_describe.rindex('-dirty')]
|
|
|
|
git_describe = git_describe[:git_describe.rindex("-dirty")]
|
|
|
|
|
|
|
|
|
|
|
|
# now we have TAG-NUM-gHEX or HEX
|
|
|
|
# now we have TAG-NUM-gHEX or HEX
|
|
|
|
|
|
|
|
|
|
|
|
if '-' in git_describe:
|
|
|
|
if "-" in git_describe:
|
|
|
|
# TAG-NUM-gHEX
|
|
|
|
# TAG-NUM-gHEX
|
|
|
|
mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
|
|
|
|
mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
|
|
|
|
if not mo:
|
|
|
|
if not mo:
|
|
|
|
# unparsable. Maybe git-describe is misbehaving?
|
|
|
|
# unparsable. Maybe git-describe is misbehaving?
|
|
|
|
pieces['error'] = (
|
|
|
|
pieces["error"] = ("unable to parse git-describe output: '%s'"
|
|
|
|
"unable to parse git-describe output: '%s'" % describe_out
|
|
|
|
% describe_out)
|
|
|
|
)
|
|
|
|
|
|
|
|
return pieces
|
|
|
|
return pieces
|
|
|
|
|
|
|
|
|
|
|
|
# tag
|
|
|
|
# tag
|
|
|
@ -366,42 +334,38 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
|
|
|
|
if verbose:
|
|
|
|
if verbose:
|
|
|
|
fmt = "tag '%s' doesn't start with prefix '%s'"
|
|
|
|
fmt = "tag '%s' doesn't start with prefix '%s'"
|
|
|
|
print(fmt % (full_tag, tag_prefix))
|
|
|
|
print(fmt % (full_tag, tag_prefix))
|
|
|
|
pieces['error'] = "tag '%s' doesn't start with prefix '%s'" % (
|
|
|
|
pieces["error"] = ("tag '%s' doesn't start with prefix '%s'"
|
|
|
|
full_tag,
|
|
|
|
% (full_tag, tag_prefix))
|
|
|
|
tag_prefix,
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
return pieces
|
|
|
|
return pieces
|
|
|
|
pieces['closest-tag'] = full_tag[len(tag_prefix) :]
|
|
|
|
pieces["closest-tag"] = full_tag[len(tag_prefix):]
|
|
|
|
|
|
|
|
|
|
|
|
# distance: number of commits since tag
|
|
|
|
# distance: number of commits since tag
|
|
|
|
pieces['distance'] = int(mo.group(2))
|
|
|
|
pieces["distance"] = int(mo.group(2))
|
|
|
|
|
|
|
|
|
|
|
|
# commit: short hex revision ID
|
|
|
|
# commit: short hex revision ID
|
|
|
|
pieces['short'] = mo.group(3)
|
|
|
|
pieces["short"] = mo.group(3)
|
|
|
|
|
|
|
|
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
# HEX: no tags
|
|
|
|
# HEX: no tags
|
|
|
|
pieces['closest-tag'] = None
|
|
|
|
pieces["closest-tag"] = None
|
|
|
|
out, rc = runner(GITS, ['rev-list', 'HEAD', '--left-right'], cwd=root)
|
|
|
|
out, rc = runner(GITS, ["rev-list", "HEAD", "--left-right"], cwd=root)
|
|
|
|
pieces['distance'] = len(out.split()) # total number of commits
|
|
|
|
pieces["distance"] = len(out.split()) # total number of commits
|
|
|
|
|
|
|
|
|
|
|
|
# commit date: see ISO-8601 comment in git_versions_from_keywords()
|
|
|
|
# commit date: see ISO-8601 comment in git_versions_from_keywords()
|
|
|
|
date = runner(GITS, ['show', '-s', '--format=%ci', 'HEAD'], cwd=root)[
|
|
|
|
date = runner(GITS, ["show", "-s", "--format=%ci", "HEAD"], cwd=root)[0].strip()
|
|
|
|
0
|
|
|
|
|
|
|
|
].strip()
|
|
|
|
|
|
|
|
# Use only the last line. Previous lines may contain GPG signature
|
|
|
|
# Use only the last line. Previous lines may contain GPG signature
|
|
|
|
# information.
|
|
|
|
# information.
|
|
|
|
date = date.splitlines()[-1]
|
|
|
|
date = date.splitlines()[-1]
|
|
|
|
pieces['date'] = date.strip().replace(' ', 'T', 1).replace(' ', '', 1)
|
|
|
|
pieces["date"] = date.strip().replace(" ", "T", 1).replace(" ", "", 1)
|
|
|
|
|
|
|
|
|
|
|
|
return pieces
|
|
|
|
return pieces
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def plus_or_dot(pieces):
|
|
|
|
def plus_or_dot(pieces):
|
|
|
|
"""Return a + if we don't already have one, else return a ."""
|
|
|
|
"""Return a + if we don't already have one, else return a ."""
|
|
|
|
if '+' in pieces.get('closest-tag', ''):
|
|
|
|
if "+" in pieces.get("closest-tag", ""):
|
|
|
|
return '.'
|
|
|
|
return "."
|
|
|
|
return '+'
|
|
|
|
return "+"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def render_pep440(pieces):
|
|
|
|
def render_pep440(pieces):
|
|
|
@ -413,18 +377,19 @@ def render_pep440(pieces):
|
|
|
|
Exceptions:
|
|
|
|
Exceptions:
|
|
|
|
1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty]
|
|
|
|
1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty]
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
if pieces['closest-tag']:
|
|
|
|
if pieces["closest-tag"]:
|
|
|
|
rendered = pieces['closest-tag']
|
|
|
|
rendered = pieces["closest-tag"]
|
|
|
|
if pieces['distance'] or pieces['dirty']:
|
|
|
|
if pieces["distance"] or pieces["dirty"]:
|
|
|
|
rendered += plus_or_dot(pieces)
|
|
|
|
rendered += plus_or_dot(pieces)
|
|
|
|
rendered += '%d.g%s' % (pieces['distance'], pieces['short'])
|
|
|
|
rendered += "%d.g%s" % (pieces["distance"], pieces["short"])
|
|
|
|
if pieces['dirty']:
|
|
|
|
if pieces["dirty"]:
|
|
|
|
rendered += '.dirty'
|
|
|
|
rendered += ".dirty"
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
# exception #1
|
|
|
|
# exception #1
|
|
|
|
rendered = '0+untagged.%d.g%s' % (pieces['distance'], pieces['short'])
|
|
|
|
rendered = "0+untagged.%d.g%s" % (pieces["distance"],
|
|
|
|
if pieces['dirty']:
|
|
|
|
pieces["short"])
|
|
|
|
rendered += '.dirty'
|
|
|
|
if pieces["dirty"]:
|
|
|
|
|
|
|
|
rendered += ".dirty"
|
|
|
|
return rendered
|
|
|
|
return rendered
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -437,23 +402,24 @@ def render_pep440_branch(pieces):
|
|
|
|
Exceptions:
|
|
|
|
Exceptions:
|
|
|
|
1: no tags. 0[.dev0]+untagged.DISTANCE.gHEX[.dirty]
|
|
|
|
1: no tags. 0[.dev0]+untagged.DISTANCE.gHEX[.dirty]
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
if pieces['closest-tag']:
|
|
|
|
if pieces["closest-tag"]:
|
|
|
|
rendered = pieces['closest-tag']
|
|
|
|
rendered = pieces["closest-tag"]
|
|
|
|
if pieces['distance'] or pieces['dirty']:
|
|
|
|
if pieces["distance"] or pieces["dirty"]:
|
|
|
|
if pieces['branch'] != 'master':
|
|
|
|
if pieces["branch"] != "master":
|
|
|
|
rendered += '.dev0'
|
|
|
|
rendered += ".dev0"
|
|
|
|
rendered += plus_or_dot(pieces)
|
|
|
|
rendered += plus_or_dot(pieces)
|
|
|
|
rendered += '%d.g%s' % (pieces['distance'], pieces['short'])
|
|
|
|
rendered += "%d.g%s" % (pieces["distance"], pieces["short"])
|
|
|
|
if pieces['dirty']:
|
|
|
|
if pieces["dirty"]:
|
|
|
|
rendered += '.dirty'
|
|
|
|
rendered += ".dirty"
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
# exception #1
|
|
|
|
# exception #1
|
|
|
|
rendered = '0'
|
|
|
|
rendered = "0"
|
|
|
|
if pieces['branch'] != 'master':
|
|
|
|
if pieces["branch"] != "master":
|
|
|
|
rendered += '.dev0'
|
|
|
|
rendered += ".dev0"
|
|
|
|
rendered += '+untagged.%d.g%s' % (pieces['distance'], pieces['short'])
|
|
|
|
rendered += "+untagged.%d.g%s" % (pieces["distance"],
|
|
|
|
if pieces['dirty']:
|
|
|
|
pieces["short"])
|
|
|
|
rendered += '.dirty'
|
|
|
|
if pieces["dirty"]:
|
|
|
|
|
|
|
|
rendered += ".dirty"
|
|
|
|
return rendered
|
|
|
|
return rendered
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -463,7 +429,7 @@ def pep440_split_post(ver):
|
|
|
|
Returns the release segments before the post-release and the
|
|
|
|
Returns the release segments before the post-release and the
|
|
|
|
post-release version number (or -1 if no post-release segment is present).
|
|
|
|
post-release version number (or -1 if no post-release segment is present).
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
vc = str.split(ver, '.post')
|
|
|
|
vc = str.split(ver, ".post")
|
|
|
|
return vc[0], int(vc[1] or 0) if len(vc) == 2 else None
|
|
|
|
return vc[0], int(vc[1] or 0) if len(vc) == 2 else None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -473,26 +439,21 @@ def render_pep440_pre(pieces):
|
|
|
|
Exceptions:
|
|
|
|
Exceptions:
|
|
|
|
1: no tags. 0.post0.devDISTANCE
|
|
|
|
1: no tags. 0.post0.devDISTANCE
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
if pieces['closest-tag']:
|
|
|
|
if pieces["closest-tag"]:
|
|
|
|
if pieces['distance']:
|
|
|
|
if pieces["distance"]:
|
|
|
|
# update the post release segment
|
|
|
|
# update the post release segment
|
|
|
|
tag_version, post_version = pep440_split_post(
|
|
|
|
tag_version, post_version = pep440_split_post(pieces["closest-tag"])
|
|
|
|
pieces['closest-tag']
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
rendered = tag_version
|
|
|
|
rendered = tag_version
|
|
|
|
if post_version is not None:
|
|
|
|
if post_version is not None:
|
|
|
|
rendered += '.post%d.dev%d' % (
|
|
|
|
rendered += ".post%d.dev%d" % (post_version + 1, pieces["distance"])
|
|
|
|
post_version + 1,
|
|
|
|
|
|
|
|
pieces['distance'],
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
rendered += '.post0.dev%d' % (pieces['distance'])
|
|
|
|
rendered += ".post0.dev%d" % (pieces["distance"])
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
# no commits, use the tag as the version
|
|
|
|
# no commits, use the tag as the version
|
|
|
|
rendered = pieces['closest-tag']
|
|
|
|
rendered = pieces["closest-tag"]
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
# exception #1
|
|
|
|
# exception #1
|
|
|
|
rendered = '0.post0.dev%d' % pieces['distance']
|
|
|
|
rendered = "0.post0.dev%d" % pieces["distance"]
|
|
|
|
return rendered
|
|
|
|
return rendered
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -506,20 +467,20 @@ def render_pep440_post(pieces):
|
|
|
|
Exceptions:
|
|
|
|
Exceptions:
|
|
|
|
1: no tags. 0.postDISTANCE[.dev0]
|
|
|
|
1: no tags. 0.postDISTANCE[.dev0]
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
if pieces['closest-tag']:
|
|
|
|
if pieces["closest-tag"]:
|
|
|
|
rendered = pieces['closest-tag']
|
|
|
|
rendered = pieces["closest-tag"]
|
|
|
|
if pieces['distance'] or pieces['dirty']:
|
|
|
|
if pieces["distance"] or pieces["dirty"]:
|
|
|
|
rendered += '.post%d' % pieces['distance']
|
|
|
|
rendered += ".post%d" % pieces["distance"]
|
|
|
|
if pieces['dirty']:
|
|
|
|
if pieces["dirty"]:
|
|
|
|
rendered += '.dev0'
|
|
|
|
rendered += ".dev0"
|
|
|
|
rendered += plus_or_dot(pieces)
|
|
|
|
rendered += plus_or_dot(pieces)
|
|
|
|
rendered += 'g%s' % pieces['short']
|
|
|
|
rendered += "g%s" % pieces["short"]
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
# exception #1
|
|
|
|
# exception #1
|
|
|
|
rendered = '0.post%d' % pieces['distance']
|
|
|
|
rendered = "0.post%d" % pieces["distance"]
|
|
|
|
if pieces['dirty']:
|
|
|
|
if pieces["dirty"]:
|
|
|
|
rendered += '.dev0'
|
|
|
|
rendered += ".dev0"
|
|
|
|
rendered += '+g%s' % pieces['short']
|
|
|
|
rendered += "+g%s" % pieces["short"]
|
|
|
|
return rendered
|
|
|
|
return rendered
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -531,24 +492,24 @@ def render_pep440_post_branch(pieces):
|
|
|
|
Exceptions:
|
|
|
|
Exceptions:
|
|
|
|
1: no tags. 0.postDISTANCE[.dev0]+gHEX[.dirty]
|
|
|
|
1: no tags. 0.postDISTANCE[.dev0]+gHEX[.dirty]
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
if pieces['closest-tag']:
|
|
|
|
if pieces["closest-tag"]:
|
|
|
|
rendered = pieces['closest-tag']
|
|
|
|
rendered = pieces["closest-tag"]
|
|
|
|
if pieces['distance'] or pieces['dirty']:
|
|
|
|
if pieces["distance"] or pieces["dirty"]:
|
|
|
|
rendered += '.post%d' % pieces['distance']
|
|
|
|
rendered += ".post%d" % pieces["distance"]
|
|
|
|
if pieces['branch'] != 'master':
|
|
|
|
if pieces["branch"] != "master":
|
|
|
|
rendered += '.dev0'
|
|
|
|
rendered += ".dev0"
|
|
|
|
rendered += plus_or_dot(pieces)
|
|
|
|
rendered += plus_or_dot(pieces)
|
|
|
|
rendered += 'g%s' % pieces['short']
|
|
|
|
rendered += "g%s" % pieces["short"]
|
|
|
|
if pieces['dirty']:
|
|
|
|
if pieces["dirty"]:
|
|
|
|
rendered += '.dirty'
|
|
|
|
rendered += ".dirty"
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
# exception #1
|
|
|
|
# exception #1
|
|
|
|
rendered = '0.post%d' % pieces['distance']
|
|
|
|
rendered = "0.post%d" % pieces["distance"]
|
|
|
|
if pieces['branch'] != 'master':
|
|
|
|
if pieces["branch"] != "master":
|
|
|
|
rendered += '.dev0'
|
|
|
|
rendered += ".dev0"
|
|
|
|
rendered += '+g%s' % pieces['short']
|
|
|
|
rendered += "+g%s" % pieces["short"]
|
|
|
|
if pieces['dirty']:
|
|
|
|
if pieces["dirty"]:
|
|
|
|
rendered += '.dirty'
|
|
|
|
rendered += ".dirty"
|
|
|
|
return rendered
|
|
|
|
return rendered
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -560,17 +521,17 @@ def render_pep440_old(pieces):
|
|
|
|
Exceptions:
|
|
|
|
Exceptions:
|
|
|
|
1: no tags. 0.postDISTANCE[.dev0]
|
|
|
|
1: no tags. 0.postDISTANCE[.dev0]
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
if pieces['closest-tag']:
|
|
|
|
if pieces["closest-tag"]:
|
|
|
|
rendered = pieces['closest-tag']
|
|
|
|
rendered = pieces["closest-tag"]
|
|
|
|
if pieces['distance'] or pieces['dirty']:
|
|
|
|
if pieces["distance"] or pieces["dirty"]:
|
|
|
|
rendered += '.post%d' % pieces['distance']
|
|
|
|
rendered += ".post%d" % pieces["distance"]
|
|
|
|
if pieces['dirty']:
|
|
|
|
if pieces["dirty"]:
|
|
|
|
rendered += '.dev0'
|
|
|
|
rendered += ".dev0"
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
# exception #1
|
|
|
|
# exception #1
|
|
|
|
rendered = '0.post%d' % pieces['distance']
|
|
|
|
rendered = "0.post%d" % pieces["distance"]
|
|
|
|
if pieces['dirty']:
|
|
|
|
if pieces["dirty"]:
|
|
|
|
rendered += '.dev0'
|
|
|
|
rendered += ".dev0"
|
|
|
|
return rendered
|
|
|
|
return rendered
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -582,15 +543,15 @@ def render_git_describe(pieces):
|
|
|
|
Exceptions:
|
|
|
|
Exceptions:
|
|
|
|
1: no tags. HEX[-dirty] (note: no 'g' prefix)
|
|
|
|
1: no tags. HEX[-dirty] (note: no 'g' prefix)
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
if pieces['closest-tag']:
|
|
|
|
if pieces["closest-tag"]:
|
|
|
|
rendered = pieces['closest-tag']
|
|
|
|
rendered = pieces["closest-tag"]
|
|
|
|
if pieces['distance']:
|
|
|
|
if pieces["distance"]:
|
|
|
|
rendered += '-%d-g%s' % (pieces['distance'], pieces['short'])
|
|
|
|
rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
# exception #1
|
|
|
|
# exception #1
|
|
|
|
rendered = pieces['short']
|
|
|
|
rendered = pieces["short"]
|
|
|
|
if pieces['dirty']:
|
|
|
|
if pieces["dirty"]:
|
|
|
|
rendered += '-dirty'
|
|
|
|
rendered += "-dirty"
|
|
|
|
return rendered
|
|
|
|
return rendered
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -603,57 +564,51 @@ def render_git_describe_long(pieces):
|
|
|
|
Exceptions:
|
|
|
|
Exceptions:
|
|
|
|
1: no tags. HEX[-dirty] (note: no 'g' prefix)
|
|
|
|
1: no tags. HEX[-dirty] (note: no 'g' prefix)
|
|
|
|
"""
|
|
|
|
"""
|
|
|
|
if pieces['closest-tag']:
|
|
|
|
if pieces["closest-tag"]:
|
|
|
|
rendered = pieces['closest-tag']
|
|
|
|
rendered = pieces["closest-tag"]
|
|
|
|
rendered += '-%d-g%s' % (pieces['distance'], pieces['short'])
|
|
|
|
rendered += "-%d-g%s" % (pieces["distance"], pieces["short"])
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
# exception #1
|
|
|
|
# exception #1
|
|
|
|
rendered = pieces['short']
|
|
|
|
rendered = pieces["short"]
|
|
|
|
if pieces['dirty']:
|
|
|
|
if pieces["dirty"]:
|
|
|
|
rendered += '-dirty'
|
|
|
|
rendered += "-dirty"
|
|
|
|
return rendered
|
|
|
|
return rendered
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def render(pieces, style):
|
|
|
|
def render(pieces, style):
|
|
|
|
"""Render the given version pieces into the requested style."""
|
|
|
|
"""Render the given version pieces into the requested style."""
|
|
|
|
if pieces['error']:
|
|
|
|
if pieces["error"]:
|
|
|
|
return {
|
|
|
|
return {"version": "unknown",
|
|
|
|
'version': 'unknown',
|
|
|
|
"full-revisionid": pieces.get("long"),
|
|
|
|
'full-revisionid': pieces.get('long'),
|
|
|
|
"dirty": None,
|
|
|
|
'dirty': None,
|
|
|
|
"error": pieces["error"],
|
|
|
|
'error': pieces['error'],
|
|
|
|
"date": None}
|
|
|
|
'date': None,
|
|
|
|
|
|
|
|
}
|
|
|
|
if not style or style == "default":
|
|
|
|
|
|
|
|
style = "pep440" # the default
|
|
|
|
if not style or style == 'default':
|
|
|
|
|
|
|
|
style = 'pep440' # the default
|
|
|
|
if style == "pep440":
|
|
|
|
|
|
|
|
|
|
|
|
if style == 'pep440':
|
|
|
|
|
|
|
|
rendered = render_pep440(pieces)
|
|
|
|
rendered = render_pep440(pieces)
|
|
|
|
elif style == 'pep440-branch':
|
|
|
|
elif style == "pep440-branch":
|
|
|
|
rendered = render_pep440_branch(pieces)
|
|
|
|
rendered = render_pep440_branch(pieces)
|
|
|
|
elif style == 'pep440-pre':
|
|
|
|
elif style == "pep440-pre":
|
|
|
|
rendered = render_pep440_pre(pieces)
|
|
|
|
rendered = render_pep440_pre(pieces)
|
|
|
|
elif style == 'pep440-post':
|
|
|
|
elif style == "pep440-post":
|
|
|
|
rendered = render_pep440_post(pieces)
|
|
|
|
rendered = render_pep440_post(pieces)
|
|
|
|
elif style == 'pep440-post-branch':
|
|
|
|
elif style == "pep440-post-branch":
|
|
|
|
rendered = render_pep440_post_branch(pieces)
|
|
|
|
rendered = render_pep440_post_branch(pieces)
|
|
|
|
elif style == 'pep440-old':
|
|
|
|
elif style == "pep440-old":
|
|
|
|
rendered = render_pep440_old(pieces)
|
|
|
|
rendered = render_pep440_old(pieces)
|
|
|
|
elif style == 'git-describe':
|
|
|
|
elif style == "git-describe":
|
|
|
|
rendered = render_git_describe(pieces)
|
|
|
|
rendered = render_git_describe(pieces)
|
|
|
|
elif style == 'git-describe-long':
|
|
|
|
elif style == "git-describe-long":
|
|
|
|
rendered = render_git_describe_long(pieces)
|
|
|
|
rendered = render_git_describe_long(pieces)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
raise ValueError("unknown style '%s'" % style)
|
|
|
|
raise ValueError("unknown style '%s'" % style)
|
|
|
|
|
|
|
|
|
|
|
|
return {
|
|
|
|
return {"version": rendered, "full-revisionid": pieces["long"],
|
|
|
|
'version': rendered,
|
|
|
|
"dirty": pieces["dirty"], "error": None,
|
|
|
|
'full-revisionid': pieces['long'],
|
|
|
|
"date": pieces.get("date")}
|
|
|
|
'dirty': pieces['dirty'],
|
|
|
|
|
|
|
|
'error': None,
|
|
|
|
|
|
|
|
'date': pieces.get('date'),
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_versions():
|
|
|
|
def get_versions():
|
|
|
@ -667,9 +622,8 @@ def get_versions():
|
|
|
|
verbose = cfg.verbose
|
|
|
|
verbose = cfg.verbose
|
|
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
return git_versions_from_keywords(
|
|
|
|
return git_versions_from_keywords(get_keywords(), cfg.tag_prefix,
|
|
|
|
get_keywords(), cfg.tag_prefix, verbose
|
|
|
|
verbose)
|
|
|
|
)
|
|
|
|
|
|
|
|
except NotThisMethod:
|
|
|
|
except NotThisMethod:
|
|
|
|
pass
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
|
@ -681,13 +635,10 @@ def get_versions():
|
|
|
|
for _ in cfg.versionfile_source.split('/'):
|
|
|
|
for _ in cfg.versionfile_source.split('/'):
|
|
|
|
root = os.path.dirname(root)
|
|
|
|
root = os.path.dirname(root)
|
|
|
|
except NameError:
|
|
|
|
except NameError:
|
|
|
|
return {
|
|
|
|
return {"version": "0+unknown", "full-revisionid": None,
|
|
|
|
'version': '0+unknown',
|
|
|
|
"dirty": None,
|
|
|
|
'full-revisionid': None,
|
|
|
|
"error": "unable to find root of source tree",
|
|
|
|
'dirty': None,
|
|
|
|
"date": None}
|
|
|
|
'error': 'unable to find root of source tree',
|
|
|
|
|
|
|
|
'date': None,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose)
|
|
|
|
pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose)
|
|
|
@ -701,10 +652,6 @@ def get_versions():
|
|
|
|
except NotThisMethod:
|
|
|
|
except NotThisMethod:
|
|
|
|
pass
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
|
|
return {
|
|
|
|
return {"version": "0+unknown", "full-revisionid": None,
|
|
|
|
'version': '0+unknown',
|
|
|
|
"dirty": None,
|
|
|
|
'full-revisionid': None,
|
|
|
|
"error": "unable to compute version", "date": None}
|
|
|
|
'dirty': None,
|
|
|
|
|
|
|
|
'error': 'unable to compute version',
|
|
|
|
|
|
|
|
'date': None,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|