Merge pull request #3129 from mroutis/fix-version

version: decode correctly commands output
This commit is contained in:
Ruslan Kuprieiev
2020-01-14 10:20:12 +02:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -49,7 +49,7 @@ def _is_release(dir_path, base_version):
["git", "describe", "--tags", "--exact-match"],
cwd=dir_path,
stderr=subprocess.STDOUT,
)
).decode("utf-8")
tag = output.strip()
return tag == base_version
except subprocess.CalledProcessError:
+2 -2
View File
@@ -12,10 +12,10 @@ def test_is_release():
assert ret is False
m.side_effect = None
m.return_value = dvc.version._BASE_VERSION
m.return_value = dvc.version._BASE_VERSION.encode("ascii")
ret = dvc.version._is_release(None, dvc.version._BASE_VERSION)
assert ret
m.return_value = "630d1741c2d5dd89a3176bd15b63121b905d35c9"
m.return_value = b"630d1741c2d5dd89a3176bd15b63121b905d35c9"
ret = dvc.version._is_release(None, dvc.version._BASE_VERSION)
assert ret is False