Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions setuptools_scm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,15 @@ def get_version(root='.',
version = _do_parse(root, parse)

if version:
dump_version(
root=root,
version=version,
write_to=write_to,
template=write_to_template)
if isinstance(version, string_types):
return version
version = format_version(
version,
version_scheme=version_scheme,
local_scheme=local_scheme)
dump_version(
root=root,
version=version,
write_to=write_to,
template=write_to_template)
return version
8 changes: 7 additions & 1 deletion testing/test_functions.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pytest
import pkg_resources
from setuptools_scm import dump_version
from setuptools_scm import dump_version, get_version, PRETEND_KEY
from setuptools_scm.version import guess_next_version, meta, format_version


Expand Down Expand Up @@ -56,3 +56,9 @@ def test_dump_version_doesnt_bail_on_value_error(tmpdir):
with pytest.raises(ValueError) as exc_info:
dump_version(tmpdir.strpath, version, write_to)
assert str(exc_info.value).startswith("bad file format:")


def test_dump_version_works_with_pretend(tmpdir, monkeypatch):
monkeypatch.setenv(PRETEND_KEY, '1.0')
get_version(write_to=str(tmpdir.join('VERSION.txt')))
assert tmpdir.join('VERSION.txt').read() == '1.0'