diff options
| -rw-r--r-- | CHANGELOG.rst | 5 | ||||
| -rw-r--r-- | src/setuptools_scm/git.py | 2 | ||||
| -rw-r--r-- | testing/test_git.py | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 65eca61..251ee8d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,8 @@ +v4.1.2 +======= + +* disallow git tags without dots by default again - #449 + v4.1.1 ======= diff --git a/src/setuptools_scm/git.py b/src/setuptools_scm/git.py index 76be436..afefa34 100644 --- a/src/setuptools_scm/git.py +++ b/src/setuptools_scm/git.py @@ -12,7 +12,7 @@ except ImportError: from .win_py31_compat import samefile -DEFAULT_DESCRIBE = "git describe --dirty --tags --long --match *[0-9]*" +DEFAULT_DESCRIBE = "git describe --dirty --tags --long --match *.*" class GitWorkdir(object): diff --git a/testing/test_git.py b/testing/test_git.py index e92d19a..542a29f 100644 --- a/testing/test_git.py +++ b/testing/test_git.py @@ -254,6 +254,7 @@ def test_not_matching_tags(wd): @pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/411") +@pytest.mark.xfail(reason="https://github.com/pypa/setuptools_scm/issues/449") def test_non_dotted_version(wd): wd.commit_testfile() wd("git tag apache-arrow-1") |