8000 get_versions: switch on versioneer.VCS · drinkingjava/python-versioneer@6a2d655 · GitHub
[go: up one dir, main page]

Skip to content

Commit 6a2d655

Browse files
committed
get_versions: switch on versioneer.VCS
1 parent 431733a commit 6a2d655

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

src/cmdclass.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ def run(self):
4040
_build_exe.run(self)
4141
os.unlink(target_versionfile)
4242
f = open(versionfile_source, "w")
43+
assert VCS is not None, "please set versioneer.VCS"
4344
LONG = LONG_VERSION_PY[VCS]
4445
f.write(LONG % {"DOLLAR": "$",
4546
"TAG_PREFIX": tag_prefix,
@@ -84,6 +85,7 @@ def finalize_options(self):
8485
def run(self):
8586
print(" creating %s" % versionfile_source)
8687
f = open(versionfile_source, "w")
88+
assert VCS is not None, "please set versioneer.VCS"
8789
LONG = LONG_VERSION_PY[VCS]
8890
f.write(LONG % {"DOLLAR": "$",
8991
"TAG_PREFIX": tag_prefix,

src/get_versions.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ def get_versions(default=DEFAULT, verbose=False):
1010
assert versionfile_source is not None, "please set versioneer.versionfile_source"
1111
assert tag_prefix is not None, "please set versioneer.tag_prefix"
1212
assert parentdir_prefix is not None, "please set versioneer.parentdir_prefix"
13+
assert VCS is not None, "please set versioneer.VCS"
14+
1315
# I am in versioneer.py, which must live at the top of the source tree,
1416
# which we use to compute the root directory. py2exe/bbfreeze/non-CPython
1517
# don't have __file__, in which case we fall back to sys.argv[0] (which
@@ -24,8 +26,11 @@ def get_versions(default=DEFAULT, verbose=False):
2426
# tarball/zipball created by 'git archive' or github's download-from-tag
2527
# feature.
2628

27-
ver = git_versions_from_keywords(git_get_keywords(versionfile_abs),
28-
tag_prefix)
29+
if VCS == "git":
30+
ver = git_versions_from_keywords(git_get_keywords(versionfile_abs),
31+
tag_prefix)
32+
else:
33+
ver = None
2934
if ver:
3035
if verbose: print("got version from expanded keyword %s" % ver)
3136
return ver
@@ -35,7 +40,10 @@ def get_versions(default=DEFAULT, verbose=False):
3540
if verbose: print("got version from file %s %s" % (versionfile_abs,ver))
3641
return ver
3742

38-
ver = git_versions_from_vcs(tag_prefix, root, verbose)
43+
if VCS == "git":
44+
ver = git_versions_from_vcs(tag_prefix, root, verbose)
45+
else:
46+
ver = None
3947
if ver:
4048
if verbose: print("got version from git %s" % ver)
4149
return ver

0 commit comments

Comments
 (0)
0