Skip to content

Commit 8d9c073

Browse files
try to fix #167 by introducing a preformated flag
1 parent 00f3fbe commit 8d9c073

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

setuptools_scm/hacks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def parse_pkginfo(root):
1010
data = data_from_mime(pkginfo)
1111
version = data.get('Version')
1212
if version != 'UNKNOWN':
13-
return meta(version)
13+
return meta(version, preformatted=True)
1414

1515

1616
def parse_pip_egg_info(root):

setuptools_scm/version.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ def tags_to_versions(tags):
5555
class ScmVersion(object):
5656
def __init__(self, tag_version,
5757
distance=None, node=None, dirty=False,
58+
preformated=False,
5859
**kw):
5960
self.tag = tag_version
6061
if dirty and distance is None:
@@ -84,11 +85,17 @@ def format_choice(self, clean_format, dirty_format):
8485
return self.format_with(dirty_format if self.dirty else clean_format)
8586

8687

87-
def meta(tag, distance=None, dirty=False, node=None, **kw):
88+
def _parse_tag(tag, preformated):
89+
if preformated:
90+
return tag
8891
if SetuptoolsVersion is None or not isinstance(tag, SetuptoolsVersion):
8992
tag = tag_to_version(tag)
90-
trace('version', tag)
93+
return tag
94+
9195

96+
def meta(tag, distance=None, dirty=False, node=None, preformated=False, **kw):
97+
tag = _parse_tag(tag, preformated)
98+
trace('version', tag)
9299
assert tag is not None, 'cant parse version %s' % tag
93100
return ScmVersion(tag, distance, node, dirty, **kw)
94101

@@ -147,6 +154,8 @@ def postrelease_version(version):
147154
def format_version(version, **config):
148155
trace('scm version', version)
149156
trace('config', config)
157+
if version.preformated:
158+
return version.tag
150159
version_scheme = callable_or_entrypoint(
151160
'setuptools_scm.version_scheme', config['version_scheme'])
152161
local_scheme = callable_or_entrypoint(

0 commit comments

Comments
 (0)