unify configruation initialization and configuration defaultsfix-374

1 files changed, 5 insertions, 5 deletions

diff --git a/src/setuptools_scm/integration.py b/src/setuptools_scm/integration.py
index 41dcbbb..c623db7 100644
--- a/src/setuptools_scm/integration.py
+++ b/src/setuptools_scm/integration.py
@@ -2,7 +2,7 @@ from pkg_resources import iter_entry_points
 
 from .version import _warn_if_setuptools_outdated
 from .utils import do, trace_exception
-from . import get_version
+from . import _get_version, Configuration
 
 
 def version_keyword(dist, keyword, value):
@@ -13,8 +13,8 @@ def version_keyword(dist, keyword, value):
         value = {}
     if getattr(value, "__call__", None):
         value = value()
-
-    dist.metadata.version = get_version(**value)
+    config = Configuration(**value)
+    dist.metadata.version = _get_version(config)
 
 
 def find_files(path=""):
@@ -42,7 +42,7 @@ def _args_from_toml(name="pyproject.toml"):
 def infer_version(dist):
 
     try:
-        args = _args_from_toml()
+        config = Configuration.from_file()
     except Exception:
         return trace_exception()
-    dist.metadata.version = get_version(**args)
+    dist.metadata.version = _get_version(config)