Merge stable into develop (Resolved conflicts) - #10060
Merged
Merged
Conversation
Bumps the uv group with 1 update in the / directory: [gitpython](https://github.com/gitpython-developers/GitPython). Updates `gitpython` from 3.1.52 to 3.1.54 - [Release notes](https://github.com/gitpython-developers/GitPython/releases) - [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES) - [Commits](gitpython-developers/GitPython@3.1.52...3.1.54) --- updated-dependencies: - dependency-name: gitpython dependency-version: 3.1.54 dependency-type: direct:production dependency-group: uv ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Update python_sdk to version v1.22.2 against stable
update the cypher query for get_node_field_summaries() to only check objects that are part of the diff instead of erroneously including objects with the same UUID from different diffs
…updates (#10043) Bumps the npm_and_yarn group with 1 update in the /frontend/app directory: [react-router](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router). Bumps the npm_and_yarn group with 2 updates in the /frontend/packages/plugins/template directory: [brace-expansion](https://github.com/juliangruber/brace-expansion) and [postcss](https://github.com/postcss/postcss). Updates `react-router` from 7.18.0 to 8.3.0 - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router@8.3.0/packages/react-router) Updates `brace-expansion` from 1.1.16 to 5.0.8 - [Release notes](https://github.com/juliangruber/brace-expansion/releases) - [Commits](juliangruber/brace-expansion@v1.1.16...v5.0.8) Updates `postcss` from 8.5.15 to 8.5.23 - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](postcss/postcss@8.5.15...8.5.23) Updates `esbuild` from 0.25.2 to 0.25.12 - [Release notes](https://github.com/evanw/esbuild/releases) - [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG-2025.md) - [Commits](evanw/esbuild@v0.25.2...v0.25.12) --- updated-dependencies: - dependency-name: react-router dependency-version: 8.3.0 dependency-type: direct:production dependency-group: npm_and_yarn - dependency-name: brace-expansion dependency-version: 5.0.8 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: postcss dependency-version: 8.5.23 dependency-type: indirect dependency-group: npm_and_yarn - dependency-name: esbuild dependency-version: 0.25.12 dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
restrict diff field summaries to the single diff being queried
github-actions
Bot
added
type/documentation
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
0 issues found across 1 file (changes from recent commits).
Confidence score: 5/5
- Automated review surfaced no issues in the provided summaries.
- No files require special attention.
Shadow auto-approve: would require human review. Stable-into-develop merge with a notable schema change. Please verify that the version bump and dependency upgrades are intended for develop, and that the generated-kind cleanup won’t affect other workflows.
Re-trigger cubic
Contributor
There was a problem hiding this comment.
Review completed against the latest diff
Shadow auto-approve: would not auto-approve because issues were found.
Re-trigger cubic
…to-develop-1 # Conflicts: # backend/infrahub/core/diff/query/field_summary.py # backend/tests/component/core/diff/repository/test_diff_repository.py # frontend/pnpm-lock.yaml # pyproject.toml # python_sdk # python_testcontainers/pyproject.toml # python_testcontainers/uv.lock # uv.lock
develop projects per-field node uuids from the field-summary query (feeding the uniqueness-constraint scoping) while stable restricts the summary to the queried diff root. Keep develop's node_uuids model and deserialization, and re-apply the diff_root scoping to both query blocks so summaries carry node uuids and stay restricted to the single diff. Keep develop's node-uuid test; port stable's cross-diff exclusion regression test onto the node_uuids model.
polmichel
force-pushed
the
pmi-merge-stable-into-develop-1
branch
from
July 28, 2026 13:52
54b311f to
93dd48c
Compare
polmichel
marked this pull request as ready for review
July 28, 2026 15:22
polmichel
changed the title
ogenstad
approved these changes
Jul 28, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Supersedes #10056 and #10057, both of which were blocked/closed. Rebuilt on
develop@d78192050+stable@10996aa8a.Summary
Merges
stableintodevelop.Conflicts resolved
backend/infrahub/core/diff/query/field_summary.py+ diff-summary tests (semantic) — both branches rewrote the same field-summary query. develop (#10053) projects per-fieldnode_uuids(feeding uniqueness-constraint scoping; consumed bycore/validators/node_diff_index.py); stable (#10054) restricts the summary to the querieddiff_root(bug fix). Neither side alone is correct. Combined both: kept develop'snode_uuidsmodel + deserialization and re-applied stable'sdiff_rootscoping to both query blocks, so summaries carry node uuids and stay restricted to the single diff. Kept develop's node-uuid test; ported stable's cross-diff exclusion regression test onto thenode_uuidsmodel. Validated against a live Neo4j — both component tests pass. (1f88bc6ea)python_sdk(submodule, diverged) — kept--ours= SDKinfrahub-developtip681b458; develop continues trackinginfrahub-developperAGENTS.md. Stable's SDK release 1.22.2 (13f26b0) lands on develop later via the SDK's ownstable → infrahub-developsync PR, not this superproject merge. (1c1aeb93c)pyproject.tomlandpython_testcontainers/pyproject.toml— stable pins a staticversion = "1.10.6"; develop usesdynamic = ["version"]. Kept develop's dynamic versioning for both packages. (4be5836e7)uv.lockandpython_testcontainers/uv.lock— regenerated withuv lockfrom develop's lock; stable added no dependencies (only a static version bump, dropped under dynamic versioning), so develop's resolved set is preserved. (1f88bc6ea)frontend/pnpm-lock.yaml— regenerated from develop's committed lock with the pinnedpnpm@10.33.2(--lockfile-only), so develop's pinned toolchain (incl. Biome 2.5.1) is preserved and only the merged workspace manifests are reconciled. (93dd48c79)Generated files regenerated
uv lock(root +python_testcontainers)pnpm@10.33.2 install --lockfile-only(frontend workspace)uv run invoke backend.generate,schema.validate-graphqlschema,schema.validate-jsonschema,docs.validate,release.validate-dockercomposeenv— all consistent, no stale diffsValidation run locally
uv lock --check— both projects passuv run invoke backend.lint— ruff + ty + mypy cleantest_diff_field_summaries.py+test_diff_repository.py::…::test_get_node_field_summaries— 2 passedNot run (need a running stack): full backend component/functional/integration suites, E2E. Frontend build/lint not run locally (frontend deps not installed in the merge worktree; covered by CI
frontend-lint).🤖 Generated with Claude Code