Skip to content

Merge develop into infrahub-develop - #1239

Merged
infrahub-github-bot-app[bot] merged 4 commits into
infrahub-developfrom
develop
Aug 12, 2026
Merged

Merge develop into infrahub-develop#1239
infrahub-github-bot-app[bot] merged 4 commits into
infrahub-developfrom
develop

Conversation

@infrahub-github-bot-app

@infrahub-github-bot-app infrahub-github-bot-app Bot commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

Merging develop into infrahub-develop after merging pull request #1238.


Summary by cubic

Fixes pytest marker registration by correctly registering infrahub_integration, removing UnknownMark warnings and preventing collection failures under strict marker checks. Also updates the SDK compatibility matrix for Infrahub 1.10.7.

  • Bug Fixes

    • Register infrahub_integration marker with the correct name and description.
    • Enable --strict-markers in tests to fail on unregistered markers.
    • Add tests to verify resource and type markers are registered.
  • Docs

    • Add Infrahub 1.10.7 → SDK 1.22.2 to the compatibility matrix and mappings.

Written for commit 3c833c6. Summary will update on new commits.

Review in cubic

gmazoyer and others added 4 commits August 10, 2026 15:13
…ame (#1233)

The marker was registered as `infrahub_integraton`, with a missing `i`, but the
loader applies `infrahub_integration`. So the marker we really use was never
registered, and the one we registered was never used. The description carried the
same kind of typo, `Integation`.

Integration tests raised a `PytestUnknownMarkWarning` on every run, and collection
failed under `--strict-markers`. `pytest --markers` also listed a marker that
nothing applies, which misleads anyone selecting tests by marker.

Turn on `--strict-markers` for our own test run so an unregistered marker fails the
build instead of passing with a warning nobody reads.

Two tests guard the marker names. The type markers are applied while collecting, so
`--strict-markers` rejects an unregistered one. The resource markers cannot be
checked that way: `MARKER_MAPPING` is built when the loader is imported, so those
marks exist before a config is attached, and `MarkGenerator` only validates a mark
once it has one. Those are compared against the registered list instead, with the
expected names taken from `MARKER_MAPPING`, so a new resource marker is covered on
its own.

Fixes #1231
Merge stable into develop
@infrahub-github-bot-app
infrahub-github-bot-app Bot requested a review from a team as a code owner August 11, 2026 19:15
@github-actions github-actions Bot added the type/documentation Improvements or additions to documentation label Aug 11, 2026
@cloudflare-workers-and-pages

Copy link
Copy Markdown

Deploying infrahub-sdk-python with  Cloudflare Pages  Cloudflare Pages

Latest commit: 3c833c6
Status: ✅  Deploy successful!
Preview URL: https://4af37cc6.infrahub-sdk-python.pages.dev
Branch Preview URL: https://develop.infrahub-sdk-python.pages.dev

View logs

@codecov

codecov Bot commented Aug 11, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

@@                 Coverage Diff                  @@
##           infrahub-develop    #1239      +/-   ##
====================================================
+ Coverage             85.09%   85.18%   +0.09%     
====================================================
  Files                   147      147              
  Lines                 15784    15786       +2     
  Branches               2710     2707       -3     
====================================================
+ Hits                  13431    13447      +16     
+ Misses                 1683     1673      -10     
+ Partials                670      666       -4     
Flag Coverage Δ
integration-tests 41.54% <ø> (+0.03%) ⬆️
python-3.10 58.22% <ø> (+0.09%) ⬆️
python-3.11 58.22% <ø> (+0.09%) ⬆️
python-3.12 58.22% <ø> (+0.09%) ⬆️
python-3.13 58.20% <ø> (+0.09%) ⬆️
python-3.14 58.22% <ø> (+0.09%) ⬆️
python-filler-3.12 24.50% <ø> (+0.04%) ⬆️

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

Files with missing lines Coverage Δ
infrahub_sdk/pytest_plugin/plugin.py 84.78% <ø> (ø)

... and 4 files with indirect coverage changes

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

@infrahub-github-bot-app
infrahub-github-bot-app Bot merged commit c248995 into infrahub-develop Aug 12, 2026
51 of 52 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type/documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants