Skip to content

Commit 1cd3958

Browse files
fix issue #103 - reorder version dumping
1 parent f9ca54d commit 1cd3958

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
v1.13.0
2+
========
3+
4+
* fix regression caused by the fix of #101
5+
* assert types for version dumping
6+
17
v1.12.0
28
=======
39

setuptools_scm/__init__.py

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ def _version_from_entrypoint(root, entrypoint):
3737

3838

3939
def dump_version(root, version, write_to, template=None):
40+
assert isinstance(version, string_types)
4041
if not write_to:
4142
return
4243
target = os.path.normpath(os.path.join(root, write_to))
@@ -101,18 +102,20 @@ def get_version(root='.',
101102
root = os.path.abspath(root)
102103
trace('root', repr(root))
103104

104-
version = _do_parse(root, parse)
105+
parsed_version = _do_parse(root, parse)
105106

106-
if version:
107+
if parsed_version:
108+
if isinstance(parsed_version, string_types):
109+
version_string = parsed_version
110+
else:
111+
version_string = format_version(
112+
parsed_version,
113+
version_scheme=version_scheme,
114+
local_scheme=local_scheme)
107115
dump_version(
108116
root=root,
109-
version=version,
117+
version=version_string,
110118
write_to=write_to,
111119
template=write_to_template)
112-
if isinstance(version, string_types):
113-
return version
114-
version = format_version(
115-
version,
116-
version_scheme=version_scheme,
117-
local_scheme=local_scheme)
118-
return version
120+
121+
return version_string

testing/test_functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def test_format_version(version, monkeypatch, scheme, expected):
5252

5353
def test_dump_version_doesnt_bail_on_value_error(tmpdir):
5454
write_to = "VERSION"
55-
version = VERSIONS['exact']
55+
version = str(VERSIONS['exact'].tag)
5656
with pytest.raises(ValueError) as exc_info:
5757
dump_version(tmpdir.strpath, version, write_to)
5858
assert str(exc_info.value).startswith("bad file format:")

0 commit comments

Comments
 (0)