summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRonny Pfannschmidt <opensource@ronnypfannschmidt.de>2018-07-23 15:36:28 +0200
committerRonny Pfannschmidt <opensource@ronnypfannschmidt.de>2018-07-23 15:36:28 +0200
commit31295f64c6c2298950c35cf09d69781f2bd254bd (patch)
tree3e103b0a3b0bb20f06f8533c3cd20db5de265c2b /src
parentae5533a4ee3be9f06270bcf9c4e152bedf59b832 (diff)
downloadsetuptools-scm-31295f64c6c2298950c35cf09d69781f2bd254bd.tar.gz
fix #281 - reorder arguments to allow prior calls to work
Diffstat (limited to 'src')
-rw-r--r--src/setuptools_scm/git.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/setuptools_scm/git.py b/src/setuptools_scm/git.py
index 07b976b..5ba9ecf 100644
--- a/src/setuptools_scm/git.py
+++ b/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)