diff options
| author | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2016-01-18 09:55:30 +0100 |
|---|---|---|
| committer | Ronny Pfannschmidt <opensource@ronnypfannschmidt.de> | 2016-01-18 09:55:30 +0100 |
| commit | ab3853e82e3ff76d12c560f5daebba4af25122bc (patch) | |
| tree | d979543df0ba5fd4cc796fbea58b3034a8a5874f | |
| parent | 3649c15317a8d533fb7ba6eebabdaaa798945452 (diff) | |
| parent | 1ef9235f7ca54ffd16197cd2d1ee12777b068684 (diff) | |
| download | setuptools-scm-ab3853e82e3ff76d12c560f5daebba4af25122bc.tar.gz | |
Merge pull request #76 from brianmay/fix_v_prefix
Ensure we call tag_to_version, fixed #61
| -rw-r--r-- | setuptools_scm/version.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/setuptools_scm/version.py b/setuptools_scm/version.py index 4848dfc..40bd89d 100644 --- a/setuptools_scm/version.py +++ b/setuptools_scm/version.py @@ -31,6 +31,7 @@ def callable_or_entrypoint(group, callable_or_name): def tag_to_version(tag): trace('tag', tag) # lstrip the v because of py2/py3 differences in setuptools + # also required for old versions of setuptools version = tag.rsplit('-', 1)[-1].lstrip('v') if parse_version is None: return version @@ -78,7 +79,7 @@ class ScmVersion(object): def meta(tag, distance=None, dirty=False, node=None, **kw): - if parse_version is not None and not isinstance(tag, SetuptoolsVersion): + if SetuptoolsVersion is None or not isinstance(tag, SetuptoolsVersion): tag = tag_to_version(tag) trace('version', tag) |