Skip to content

Commit ab3853e

Browse files
Merge pull request #76 from brianmay/fix_v_prefix
Ensure we call tag_to_version, fixed #61
2 parents 3649c15 + 1ef9235 commit ab3853e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

setuptools_scm/version.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ def callable_or_entrypoint(group, callable_or_name):
3131
def tag_to_version(tag):
3232
trace('tag', tag)
3333
# lstrip the v because of py2/py3 differences in setuptools
34+
# also required for old versions of setuptools
3435
version = tag.rsplit('-', 1)[-1].lstrip('v')
3536
if parse_version is None:
3637
return version
@@ -78,7 +79,7 @@ def format_choice(self, clean_format, dirty_format):
7879

7980

8081
def meta(tag, distance=None, dirty=False, node=None, **kw):
81-
if parse_version is not None and not isinstance(tag, SetuptoolsVersion):
82+
if SetuptoolsVersion is None or not isinstance(tag, SetuptoolsVersion):
8283
tag = tag_to_version(tag)
8384
trace('version', tag)
8485

0 commit comments

Comments
 (0)