Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug in --preserve-deps handling #602

Merged
merged 1 commit into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/602-preserve_deps.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- "Fix bug in ``--preserve-deps`` option handling (https://github.com/ansible-community/antsibull/pull/602)."
3 changes: 2 additions & 1 deletion src/antsibull/build_ansible_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ def validate_deps_data(
constraints: dict[str, SemVerSpec],
) -> None:
"""
Validate dependencies against constraints and build deps.
Validate collection dependencies against constraints and build deps.

Raise ``ValueError`` in case of inconsistencies.
"""
Expand Down Expand Up @@ -467,6 +467,7 @@ def prepare_command() -> int:

if app_ctx.extra["preserve_deps"] and os.path.exists(deps_filename):
dependency_data = deps_file.parse()
python_requires = dependency_data.deps.pop("_python")
else:
dependency_data = prepare_deps(
app_ctx.extra["ansible_version"],
Expand Down