fix #374 - initialize configuration for toml integration

2 files changed, 14 insertions, 5 deletions

diff --git a/src/setuptools_scm/integration.py b/src/setuptools_scm/integration.py
index c5cc25d..41dcbbb 100644
--- a/src/setuptools_scm/integration.py
+++ b/src/setuptools_scm/integration.py
@@ -1,9 +1,8 @@
 from pkg_resources import iter_entry_points
 
 from .version import _warn_if_setuptools_outdated
-from .config import Configuration
 from .utils import do, trace_exception
-from . import get_version, _get_version
+from . import get_version
 
 
 def version_keyword(dist, keyword, value):
@@ -31,9 +30,19 @@ def find_files(path=""):
     return []
 
 
+def _args_from_toml(name="pyproject.toml"):
+    # todo: more sensible config initialization
+    # move this elper back to config and unify it with the code from get_config
+
+    with open(name) as strm:
+        defn = __import__("toml").load(strm)
+    return defn.get("tool", {})["setuptools_scm"]
+
+
 def infer_version(dist):
+
     try:
-        config = Configuration.from_file()
+        args = _args_from_toml()
     except Exception:
         return trace_exception()
-    dist.metadata.version = _get_version(config)
+    dist.metadata.version = get_version(**args)
diff --git a/testing/test_integration.py b/testing/test_integration.py
index e67f6fd..a01ac8b 100644
--- a/testing/test_integration.py
+++ b/testing/test_integration.py
@@ -16,6 +16,7 @@ def wd(wd):
 
 
 def test_pyproject_support(tmpdir, monkeypatch):
+    pytest.importorskip("toml")
     monkeypatch.delenv("SETUPTOOLS_SCM_DEBUG")
     pkg = tmpdir.ensure("package", dir=42)
     pkg.join("pyproject.toml").write(
@@ -28,7 +29,6 @@ fallback_version = "12.34"
     assert res == "12.34"
 
 
-@pytest.mark.xfail(reason="#174")
 def test_pyproject_support_with_git(tmpdir, monkeypatch, wd):
     monkeypatch.delenv("SETUPTOOLS_SCM_DEBUG")
     pkg = tmpdir.join("wd")