Manual merge develop into infrahub-develop
Merged
PO
4d ago+4016+4016+0123456789012345678901234567890123456789-7025-7025-0123456789012345678901234567890123456789
Supersedes #1525, which fails the python-lint check after merging.
Summary
Merges develop into infrahub-develop.
Conflicts resolved
Git merged the branches without text conflicts. The merged code still failed the type check and one unit test, because the two branches changed tests/unit/test_schema_offline_validation.py in incompatible ways:
develop(#1523) renamed theOutOfEnumCasefieldinvalid_valuetoexpected_inputandexpected_reason, and made the tests compare exact error messages.infrahub-develop(e5d1ed68) added adropdown-choice-statecase that still usedinvalid_value. It also changed the_schema_with_choicesfixture so that it builds aDropdownattribute instead of aTextattribute.
The fix in d10cef24:
- Ports the
dropdown-choice-statecase toexpected_input="removed"andexpected_reason="Input should be 'present' or 'absent'". The error reason is the one the validator returns. - Changes the exact message that
test_choice_bad_color_is_rejectedexpects from...attributes[0].Text.choices[0].color...to...attributes[0].Dropdown.choices[0].color..., to match the new fixture.
Validation
uv run invoke format lint-codepasses.uv run invoke docs-validatepasses.- Unit tests: 3143 passed. Locally, the subprocess tests in
tests/unit/pytest_plugin/test_plugin.pywere not run, because the testcontainers plugin crashes on this machine (invalid CPU frequency data). CI runs them. - Integration tests were not run.
š¤ Generated with Claude Code