summaryrefslogtreecommitdiff
path: root/src/setuptools_scm/integration.py
diff options
context:
space:
mode:
authorRonny Pfannschmidt <opensource@ronnypfannschmidt.de>2020-12-13 23:01:38 +0100
committerGitHub <noreply@github.com>2020-12-13 23:01:38 +0100
commit03690ec63a31a7b17403eae00b639ace8b2f13e2 (patch)
treebb70df7de7654bb3bf67cd066544cc43ee2aed9a /src/setuptools_scm/integration.py
parentb7e655c1259a0d6bce0d94be41a4ae21a2721102 (diff)
parentcf54011725bb5e6ac9911b06e23ffc5c2938a53f (diff)
downloadsetuptools-scm-5.0.1.tar.gz
Merge pull request #509 from RonnyPfannschmidt/fix-507-dist-metadata-passoverv5.0.1
fix #507 - use dist.metadata.name
Diffstat (limited to 'src/setuptools_scm/integration.py')
-rw-r--r--src/setuptools_scm/integration.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/setuptools_scm/integration.py b/src/setuptools_scm/integration.py
index ffd4521..50eb962 100644
--- a/src/setuptools_scm/integration.py
+++ b/src/setuptools_scm/integration.py
@@ -16,8 +16,12 @@ def version_keyword(dist, keyword, value):
assert (
"dist_name" not in value
), "dist_name may not be specified in the setup keyword "
- trace("dist name", dist, dist.name)
- dist_name = dist.name if dist.name != 0 else None
+
+ trace(
+ "version keyword",
+ vars(dist.metadata),
+ )
+ dist_name = dist.metadata.name
config = Configuration(dist_name=dist_name, **value)
dist.metadata.version = _get_version(config)
@@ -45,9 +49,13 @@ def _args_from_toml(name="pyproject.toml"):
def infer_version(dist):
-
+ trace(
+ "finalize hook",
+ vars(dist.metadata),
+ )
+ dist_name = dist.metadata.name
try:
- config = Configuration.from_file()
+ config = Configuration.from_file(dist_name=dist_name)
except Exception:
return trace_exception()
dist.metadata.version = _get_version(config)