Skip to content

Manual merge develop into infrahub-develop - #1529

Merged
polmichel merged 6 commits into
infrahub-developfrom
merge-develop-into-infrahub-develop-20261116
Nov 16, 2026
Merged

polmichel merged 6 commits into
infrahub-developfrom
merge-develop-into-infrahub-develop-20261116

Conversation

@polmichel

@polmichel polmichel commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

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 (test(schema): pin offline-validation errors and AttributeKind values #1523) renamed the OutOfEnumCase field invalid_value to expected_input and expected_reason, and made the tests compare exact error messages.
  • infrahub-develop (e5d1ed6) added a dropdown-choice-state case that still used invalid_value. It also changed the _schema_with_choices fixture so that it builds a Dropdown attribute instead of a Text attribute.

The fix in d10cef2:

  • Ports the dropdown-choice-state case to expected_input="removed" and expected_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_rejected expects 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-code passes.
  • uv run invoke docs-validate passes.
  • Unit tests: 3143 passed. Locally, the subprocess tests in tests/unit/pytest_plugin/test_plugin.py were 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

View guided diff Turn on auto-fix

saltas888 and others added 6 commits November 13, 2026 13:06
…teKind into the enum table (#1523)

The schema tests added by #1135 checked validator errors with
`any("<field>" in message ...)`. That passes as long as some message
mentions the field, so a changed message text or an extra error does
not fail the suite. Each of those tests now asserts exactly one error
with its full message, or its field, reason and received value.

The separate AttributeKind test checked only that "Text" is present and
"String" is absent. AttributeKind is now an entry of the parametrized
enum table, which also pins the member order.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Merge stable into develop
#1490)

* chore(lint): exclude the vendored spec-kit scripts from ruff and ty

The agent-context extension that Spec Kit 1.2 ships contains Python that
does not follow the project's rules. `.specify` is in the ruff and ty
exclude lists.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* chore(speckit): upgrade Spec Kit to 1.2.5 and opsmill-speckit to 1.4.1

Follows the "Upgrading spec-kit to 1.2 or later" steps of opsmill-speckit
v1.4.1, as in opsmill/infrahub#11376:

- remove the review extension, which does not install on Spec Kit 1.x
- upgrade the Claude integration to Spec Kit 1.2.5
- reinstall opsmill from the v1.4.1 tag
- add the checkpoint extension and the critique-opsmill preset
- replace the infrahub Jira preset with jira-branch, and delete
  dev/spec-kit/presets/infrahub
- update agent-context to 1.0.2, the version Spec Kit 1.2.5 ships, and
  keep its CLAUDE.md configuration

No file that the integration manages had local changes, so the forced
upgrade loses nothing.

Also deletes the command files that Spec Kit 0.x generated in
.agents/commands. Spec Kit 1.2 uses the skills in .agents/skills instead.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* chore(speckit): replace the infrahub branch hook with the git extension's

The infrahub extension, added in #979, ran speckit.infrahub.feature
before each specification to check the Jira reference in the branch
name. Its command file was removed with the infrahub preset, so the hook
pointed to a command that no longer exists. The jira-branch preset now
does that check in speckit.git.feature, so the hook is the git
extension's, as in opsmill/infrahub#11376.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* chore(lint): exclude the spec-kit presets from rumdl

The upgrade installs presets in .specify/presets, which rumdl checked,
unlike .specify/extensions and .specify/templates. Spec Kit regenerates
these files on each upgrade.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* chore(speckit): run the spec-kit scripts with the project's Python

The plan, tasks and template scripts of Spec Kit 1.2 need PyYAML, which
the system python3 often lacks. The Claude Code and Codex hooks that
opsmill-speckit 1.4.1 ships point them at the project environment when it
has PyYAML, and do nothing otherwise.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01X9ZEsTmHy1shuNRt88HiUb

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Merge stable into develop
…ertions

develop (#1523) switched OutOfEnumCase to expected_input/expected_reason and
asserted exact messages; infrahub-develop (e5d1ed6) added a dropdown-choice-state
case with the old invalid_value field and made the choices fixture a Dropdown
attribute. Port the new case to the new fields and expect Dropdown in the
choice color message.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@cloudflare-workers-and-pages

cloudflare-workers-and-pages Bot commented Nov 16, 2026 •

Copy link
Copy Markdown

Deploying infrahub-sdk-python with  Cloudflare Pages  Cloudflare Pages

Latest commit: d10cef2
Status: ✅  Deploy successful!
Preview URL: https://503cfc57.infrahub-sdk-python.pages.dev
Branch Preview URL: https://merge-develop-into-infrahub-p401.infrahub-sdk-python.pages.dev

View logs

@polmichel
polmichel marked this pull request as ready for review November 16, 2026 09:01
@polmichel
polmichel requested a review from a team as a code owner November 16, 2026 09:01
@codecov

codecov Bot commented Nov 16, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

@@                Coverage Diff                @@
##           infrahub-develop    #1529   +/-   ##
=================================================
  Coverage             87.88%   87.88%           
=================================================
  Files                   157      157           
  Lines                 15658    15658           
  Branches               2114     2114           
=================================================
  Hits                  13761    13761           
  Misses                 1336     1336           
  Partials                561      561           
Flag Coverage Δ
integration-tests 42.94% <ø> (ø)
python-3.10 63.04% <ø> (+0.01%) ⬆️
python-3.11 63.04% <ø> (ø)
python-3.12 63.04% <ø> (ø)
python-3.13 63.03% <ø> (-0.02%) ⬇️
python-3.14 63.03% <ø> (-0.02%) ⬇️
python-3.15 63.04% <ø> (ø)
python-filler-3.12 23.04% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.
see 3 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@polmichel polmichel changed the title Merge develop into infrahub-develop Manual merge develop into infrahub-develop Nov 16, 2026
@cubic-dev-ai

cubic-dev-ai Bot commented Nov 16, 2026

Copy link
Copy Markdown
Contributor

This PR has 10,953 reviewable changed lines after ignored/generated files are excluded, above this repository's 10,000-changed-line automatic review limit. The raw diff is 11,041 lines before ignored/generated files are excluded.

Most of the diff comes from:

  • .specify/extensions/review/tests/pester/detect-changed-files.Tests.ps1 (~740 changed lines)
  • .specify/extensions/review/tests/bats/detect-changed-files.bats (~650 changed lines)
  • .specify/scripts/bash/common.sh (~575 changed lines)
  • .agents/skills/speckit-opsmill-qa/SKILL.md (~371 changed lines)
  • .specify/extensions/opsmill/commands/qa.md (~369 changed lines)

Comment @cubic-dev-ai review this to review it anyway. If the largest files are generated or fixture data, add them to your ignored files in review settings or reviews.ignore.files in cubic.yaml. Later automatic reviews cover only subsequent changes. Request a full review to revisit earlier changes. You can also raise this limit in review settings.

@polmichel
polmichel merged commit e6b3ee7 into infrahub-develop Nov 16, 2026
33 checks passed
@polmichel
polmichel deleted the merge-develop-into-infrahub-develop-20261116 branch November 16, 2026 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants