diff options
| author | Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com> | 2020-12-11 23:04:50 +0100 |
|---|---|---|
| committer | Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com> | 2020-12-11 23:04:50 +0100 |
| commit | 5caa8e07a0ed94311e9f243829aafbaa1f7fe3e6 (patch) | |
| tree | a0a74e27de1f6dcb1013cce970172907ea2b2877 | |
| parent | 7afad49aaaac94604682735cf32de226c41c28f6 (diff) | |
| download | setuptools-scm-5caa8e07a0ed94311e9f243829aafbaa1f7fe3e6.tar.gz | |
add test and changelog for #356
| -rw-r--r-- | CHANGELOG.rst | 2 | ||||
| -rw-r--r-- | testing/test_git.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 83666ae..12bf230 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -19,7 +19,7 @@ Bugfixes: * fix #321: add suppport for the ``SETUPTOOLS_SCM_PRETEND_VERSION_FOR_${DISTRIBUTION_NAME}`` env var to target the pretend key * fix #142: clearly list supported scm * fix #213: better error message for non-zero dev numbers in tags - +* fix #356: add git branch to version on describe failure v4.1.2 ======= diff --git a/testing/test_git.py b/testing/test_git.py index 1b57fed..8eb8583 100644 --- a/testing/test_git.py +++ b/testing/test_git.py @@ -80,6 +80,8 @@ def test_parse_call_order(wd): def test_version_from_git(wd): assert wd.version == "0.1.dev0" + assert git.parse(str(wd.cwd), git.DEFAULT_DESCRIBE).branch == "master" + wd.commit_testfile() assert wd.version.startswith("0.1.dev1+g") assert not wd.version.endswith("1-") |