diff options
author | Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com> | 2020-12-13 20:20:31 +0100 |
---|---|---|
committer | Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com> | 2020-12-13 20:26:46 +0100 |
commit | 212090fdd7caf7976bc3f1dcd083dac04eb83766 (patch) | |
tree | 6603cc20ba4b354ed93fcaff7ef5807fddd8bc09 /src/setuptools_scm/integration.py | |
parent | b7e655c1259a0d6bce0d94be41a4ae21a2721102 (diff) | |
download | setuptools-scm-212090fdd7caf7976bc3f1dcd083dac04eb83766.tar.gz |
fix #507 - use dist.metadata.name and add pyproject support for dist_name
Diffstat (limited to 'src/setuptools_scm/integration.py')
-rw-r--r-- | src/setuptools_scm/integration.py | 16 |
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) |