Skip to content

Merge 'stable' to 'develop' with resolved conflicts - #1230

Open
ogenstad wants to merge 36 commits into
developfrom
pog-stable-to-develop-20260806
Open

Merge 'stable' to 'develop' with resolved conflicts#1230
ogenstad wants to merge 36 commits into
developfrom
pog-stable-to-develop-20260806

Conversation

@ogenstad

@ogenstad ogenstad commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

Why

Resolve merge conflicts between stable and develop

What changed

  • All changes from stable
  • Resolved merge conflict in pyproject.toml & uv.lock (static version of the package vs dynamic version)

Summary by cubic

Merge stable into develop and resolve packaging version conflicts. Ports 1.22.2 changes: GraphQL branch URL encoding fix, CI workflows bumped, docs compatibility updated, and dependencies refreshed.

  • Bug Fixes

    • Percent-encode branch names in the GraphQL URL path to prevent 404s; added unit tests.
  • Dependencies

    • CI: bump actions/setup-python to v7, actions/setup-node to v7, actions/labeler to v7.0.0.
    • Python dev: bump infrahub-testcontainers to 1.10.6.
    • Docs: update compatibility tables and refresh docs npm deps (e.g., postcss, svgo, websocket-driver, fast-uri, nanoid, brace-expansion, shell-quote).

Written for commit 6d76a33. Summary will update on new commits.

Review in cubic

opsmill-bot and others added 30 commits July 15, 2026 18:54
Bumps [websocket-driver](https://github.com/faye/websocket-driver-node) from 0.7.4 to 0.7.5.
- [Changelog](https://github.com/faye/websocket-driver-node/blob/main/CHANGELOG.md)
- [Commits](faye/websocket-driver-node@0.7.4...0.7.5)

---
updated-dependencies:
- dependency-name: websocket-driver
  dependency-version: 0.7.5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 6 to 7.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v6...v7)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 5 to 7.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v5...v7)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…e/actions/setup-python-7

chore(deps): bump actions/setup-python from 6 to 7
…e/actions/setup-node-7

chore(deps): bump actions/setup-node from 5 to 7
Bumps [shell-quote](https://github.com/ljharb/shell-quote) from 1.8.4 to 1.10.0.
- [Changelog](https://github.com/ljharb/shell-quote/blob/main/CHANGELOG.md)
- [Commits](ljharb/shell-quote@v1.8.4...v1.10.0)

---
updated-dependencies:
- dependency-name: shell-quote
  dependency-version: 1.10.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 5.2.5 to 5.2.6.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/v5.2.6/CHANGELOG.md)
- [Commits](webpack/webpack-dev-server@v5.2.5...v5.2.6)

---
updated-dependencies:
- dependency-name: webpack-dev-server
  dependency-version: 5.2.6
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [body-parser](https://github.com/expressjs/body-parser) from 1.20.5 to 1.20.6.
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](expressjs/body-parser@1.20.5...1.20.6)

---
updated-dependencies:
- dependency-name: body-parser
  dependency-version: 1.20.6
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…bsocket-driver-0.7.5

chore(deps): bump websocket-driver from 0.7.4 to 0.7.5 in /docs
…dy-parser-1.20.6

chore(deps): bump body-parser from 1.20.5 to 1.20.6 in /docs
…bpack-dev-server-5.2.6

chore(deps): bump webpack-dev-server from 5.2.5 to 5.2.6 in /docs
…ell-quote-1.10.0

chore(deps): bump shell-quote from 1.8.4 to 1.10.0 in /docs
Bumps [fast-uri](https://github.com/fastify/fast-uri) from 3.1.2 to 3.1.4.
- [Release notes](https://github.com/fastify/fast-uri/releases)
- [Commits](fastify/fast-uri@v3.1.2...v3.1.4)

---
updated-dependencies:
- dependency-name: fast-uri
  dependency-version: 3.1.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [svgo](https://github.com/svg/svgo) from 3.3.3 to 3.3.4.
- [Release notes](https://github.com/svg/svgo/releases)
- [Commits](svg/svgo@v3.3.3...v3.3.4)

---
updated-dependencies:
- dependency-name: svgo
  dependency-version: 3.3.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…go-3.3.4

chore(deps): bump svgo from 3.3.3 to 3.3.4 in /docs
…st-uri-3.1.4

chore(deps): bump fast-uri from 3.1.2 to 3.1.4 in /docs
…-encoding

fix: percent-encode branch name in GraphQL URL path (closes #1209)
Bumps [actions/labeler](https://github.com/actions/labeler) from 6.2.0 to 7.0.0.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](actions/labeler@v6.2.0...v7.0.0)

---
updated-dependencies:
- dependency-name: actions/labeler
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [postcss](https://github.com/postcss/postcss) from 8.5.14 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.14...8.5.23)

---
updated-dependencies:
- dependency-name: postcss
  dependency-version: 8.5.23
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…1224)

Bumps [infrahub-testcontainers](https://github.com/opsmill/infrahub) from 1.10.5 to 1.10.6.
- [Release notes](https://github.com/opsmill/infrahub/releases)
- [Changelog](https://github.com/opsmill/infrahub/blob/stable/CHANGELOG.md)
- [Commits](opsmill/infrahub@infrahub-v1.10.5...infrahub-v1.10.6)

---
updated-dependencies:
- dependency-name: infrahub-testcontainers
  dependency-version: 1.10.6
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [fast-uri](https://github.com/fastify/fast-uri) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/fastify/fast-uri/releases)
- [Commits](fastify/fast-uri@v3.1.4...v3.1.5)

---
updated-dependencies:
- dependency-name: fast-uri
  dependency-version: 3.1.5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
saltas888 and others added 6 commits August 6, 2026 14:11
…st-uri-3.1.5

chore(deps): bump fast-uri from 3.1.4 to 3.1.5 in /docs
…stcss-8.5.23

chore(deps): bump postcss from 8.5.14 to 8.5.23 in /docs
Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 1.1.14 to 1.1.18.
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](juliangruber/brace-expansion@v1.1.14...v1.1.18)

---
updated-dependencies:
- dependency-name: brace-expansion
  dependency-version: 1.1.18
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…e/actions/labeler-7.0.0

chore(deps): bump actions/labeler from 6.2.0 to 7.0.0
…ace-expansion-1.1.18

chore(deps): bump brace-expansion from 1.1.14 to 1.1.18 in /docs
@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying infrahub-sdk-python with  Cloudflare Pages  Cloudflare Pages

Latest commit: 6d76a33
Status: ✅  Deploy successful!
Preview URL: https://931a527f.infrahub-sdk-python.pages.dev
Branch Preview URL: https://pog-stable-to-develop-202608.infrahub-sdk-python.pages.dev

View logs

@github-actions github-actions Bot added group/ci Issue related to the CI pipeline type/documentation Improvements or additions to documentation labels Aug 6, 2026
@codecov

codecov Bot commented Aug 6, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

@@             Coverage Diff             @@
##           develop    #1230      +/-   ##
===========================================
- Coverage    85.21%   82.97%   -2.24%     
===========================================
  Files          146      141       -5     
  Lines        15605    12614    -2991     
  Branches      2631     1909     -722     
===========================================
- Hits         13298    10467    -2831     
+ Misses        1642     1577      -65     
+ Partials       665      570      -95     
Flag Coverage Δ
integration-tests 40.08% <50.00%> (-1.47%) ⬇️
python-3.10 57.42% <50.00%> (-0.75%) ⬇️
python-3.11 57.40% <50.00%> (-0.76%) ⬇️
python-3.12 57.42% <50.00%> (-0.73%) ⬇️
python-3.13 57.40% <50.00%> (-0.76%) ⬇️
python-3.14 57.40% <50.00%> (-0.76%) ⬇️
python-filler-3.12 21.78% <50.00%> (-2.80%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
infrahub_sdk/client.py 76.53% <100.00%> (-4.93%) ⬇️

... and 29 files with indirect coverage changes

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

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues found across 15 files

Re-trigger cubic

@ogenstad
ogenstad marked this pull request as ready for review August 6, 2026 14:46
@ogenstad
ogenstad requested a review from a team as a code owner August 6, 2026 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

group/ci Issue related to the CI pipeline type/documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants