Merge pull request #85 from esben/master

fix bug when using callable version_scheme

2 files changed, 22 insertions, 2 deletions

diff --git a/setuptools_scm/integration.py b/setuptools_scm/integration.py
index 34f91d1..5254cb0 100644
--- a/setuptools_scm/integration.py
+++ b/setuptools_scm/integration.py
@@ -12,10 +12,10 @@ def version_keyword(dist, keyword, value):
         return
     if value is True:
         value = {}
-    if os.path.exists('PKG-INFO'):
-        value.pop('root', None)
     if getattr(value, '__call__', None):
         value = value()
+    if os.path.exists('PKG-INFO'):
+        value.pop('root', None)
     dist.metadata.version = get_version(**value)
 
 
diff --git a/testing/test_regressions.py b/testing/test_regressions.py
index 4a2d90b..c123753 100644
--- a/testing/test_regressions.py
+++ b/testing/test_regressions.py
@@ -23,3 +23,23 @@ def test_pkginfo_noscmroot(tmpdir, monkeypatch):
     do('git init', p.dirpath())
     res = do('python setup.py --version', p)
     assert res == '1.0'
+
+
+def test_use_scm_version_callable(tmpdir, monkeypatch):
+    """use of callable as use_scm_version argument"""
+    monkeypatch.delenv("SETUPTOOLS_SCM_DEBUG")
+
+    p = tmpdir.ensure('sub/package', dir=1)
+    p.join('setup.py').write(
+        '''from setuptools import setup
+def vcfg():
+    from setuptools_scm.version import guess_next_dev_version
+    def vs(v):
+        return guess_next_dev_version(v)
+    return {"version_scheme": vs}
+setup(use_scm_version=vcfg)
+''')
+    p.join("PKG-INFO").write('Version: 1.0')
+
+    res = do('python setup.py --version', p)
+    assert res == '1.0'