Commit 2555347a authored by Marcel Huber's avatar Marcel Huber
Browse files

updated versioneer settings

parent 0e93a0b8
......@@ -38,7 +38,7 @@ def get_config():
# _version.py
cfg = VersioneerConfig()
cfg.VCS = "git"
cfg.style = "pep440-pre"
cfg.style = "pep440-old"
cfg.tag_prefix = ""
cfg.parentdir_prefix = "SConsider-"
cfg.versionfile_source = "SConsider/_version.py"
......@@ -243,10 +243,11 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
# 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)
describe_out, rc = run_command(
GITS, ["describe", "--tags", "--dirty", "--always", "--long", "--match",
"%s*" % tag_prefix],
cwd=root)
describe_out, rc = run_command(GITS, [
"describe", "--tags", "--dirty", "--always", "--long", "--first-parent", "--match",
"%s*" % tag_prefix
],
cwd=root)
# --long was added in git-1.5.5
if describe_out is None:
raise NotThisMethod("'git describe' failed")
......
......@@ -655,7 +655,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
# 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)
describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty",
"--always", "--long",
"--always", "--long", "--first-parent",
"--match", "%%s*" %% tag_prefix],
cwd=root)
# --long was added in git-1.5.5
......@@ -1047,7 +1047,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
# 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)
describe_out, rc = run_command(GITS, ["describe", "--tags", "--dirty",
"--always", "--long",
"--always", "--long", "--first-parent",
"--match", "%s*" % tag_prefix],
cwd=root)
# --long was added in git-1.5.5
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment