Merge pull request #282 from RonnyPfannschmidt/fix-281

fix #281 - reorder arguments to allow prior calls to work

Author: RonnyPfannschmidt

CHANGELOG.rst

@@ -1,3 +1,8 @@
+v3.0.1
+=======
+
+* fix a regression in setuptools_scm.git.parse - reorder arguments so the positional invocation from before works as expected
+
 v3.0.0
 =======
 

src/setuptools_scm/git.py

@@ -83,7 +83,9 @@ def fail_on_shallow(wd):
         )
 
 
-def parse(root, config=None, describe_command=DEFAULT_DESCRIBE, pre_parse=warn_on_shallow):
+def parse(
+    root, describe_command=DEFAULT_DESCRIBE, pre_parse=warn_on_shallow, config=None
+):
     """
     :param pre_parse: experimental pre_parse action, may change at any time
     """
@@ -120,7 +122,14 @@ def parse(root, config=None, describe_command=DEFAULT_DESCRIBE, pre_parse=warn_o
 
         branch = wd.get_branch()
         if number:
-            return meta(tag, config=config, distance=number, node=node, dirty=dirty, branch=branch)
+            return meta(
+                tag,
+                config=config,
+                distance=number,
+                node=node,
+                dirty=dirty,
+                branch=branch,
+            )
         else:
             return meta(tag, config=config, node=node, dirty=dirty, branch=branch)
 

testing/test_git.py

@@ -28,6 +28,11 @@ def test_parse_describe_output(given, tag, number, node, dirty):
     assert parsed == (tag, number, node, dirty)
 
 
+@pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/281")
+def test_parse_call_order(wd):
+    git.parse(str(wd.cwd), git.DEFAULT_DESCRIBE)
+
+
 def test_version_from_git(wd):
     assert wd.version == "0.1.dev0"