Skip to content

Commit 0af76c0

Browse files
version_keyword: introduce variable name for overrides
1 parent 27aad55 commit 0af76c0

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/setuptools_scm/_integration/setuptools.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,32 +71,32 @@ def version_keyword(
7171
keyword: str,
7272
value: bool | dict[str, Any] | Callable[[], dict[str, Any]],
7373
) -> None:
74+
overrides: dict[str, Any]
7475
if value is True:
75-
value = {}
76+
overrides = {}
7677
elif callable(value):
77-
value = value()
78+
overrides = value()
79+
else:
80+
assert isinstance(value, dict), "version_keyword expects a dict or True"
81+
overrides = value
7882

79-
assert isinstance(value, dict), "version_keyword expects a dict or True"
8083
assert (
81-
"dist_name" not in value
84+
"dist_name" not in overrides
8285
), "dist_name may not be specified in the setup keyword "
8386
dist_name: str | None = dist.metadata.name
8487
_log_hookstart("version_keyword", dist)
8588

8689
if dist.metadata.version is not None:
8790
warnings.warn(f"version of {dist_name} already set")
8891
return
89-
log.debug(
90-
"version keyword %r",
91-
vars(dist.metadata),
92-
)
93-
log.debug("dist %s %s", id(dist), id(dist.metadata))
9492

9593
if dist_name is None:
9694
dist_name = read_dist_name_from_setup_cfg()
9795

9896
config = _config.Configuration.from_file(
99-
dist_name=dist_name, _require_section=False, **value
97+
dist_name=dist_name,
98+
_require_section=False,
99+
**overrides,
100100
)
101101
_assign_version(dist, config)
102102

0 commit comments

Comments
 (0)