Merge pull request #453 from pypa/bugfix/449-disallow-the-nondot

disallow tags without dot again

Author: RonnyPfannschmidt

CHANGELOG.rst

@@ -1,3 +1,8 @@
+v4.1.2
+=======
+
+* disallow git tags without dots by default again - #449
+
 v4.1.1
 =======
 

src/setuptools_scm/git.py

@@ -12,7 +12,7 @@
     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):

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")