Merge stable into develop

.github/workflows/ci.yml

@@ -78,7 +78,7 @@ jobs:
       - name: "Check out repository code"
         uses: "actions/checkout@v7"
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: "3.12"
       - name: Install UV
@@ -141,7 +141,7 @@ jobs:
       - name: "Check out repository code"
         uses: "actions/checkout@v7"
       - name: "Set up Python"
-        uses: "actions/setup-python@v6"
+        uses: "actions/setup-python@v7"
         with:
           python-version: "3.12"
       - name: "Install uv"
@@ -169,15 +169,15 @@ jobs:
         with:
           submodules: true
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v7
         with:
           node-version: 24
           cache: "npm"
           cache-dependency-path: docs/package-lock.json
       - name: "Install dependencies"
         run: npm install
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: "3.12"
       - name: Install UV
@@ -204,7 +204,7 @@ jobs:
         with:
           submodules: true
       - name: Install NodeJS
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v7
         with:
           node-version: 24
           cache: "npm"
@@ -213,7 +213,7 @@ jobs:
         run: npm install
         working-directory: ./docs
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: "3.12"
       - name: Install UV
@@ -277,7 +277,7 @@ jobs:
       - name: "Check out repository code"
         uses: "actions/checkout@v7"
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install UV
@@ -325,7 +325,7 @@ jobs:
       - name: "Check out repository code"
         uses: "actions/checkout@v7"
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: "3.12"
       - name: "Set environment variables"
@@ -376,7 +376,7 @@ jobs:
   #         submodules: true
 
   #     - name: Set up Python
-  #       uses: actions/setup-python@v6
+  #       uses: actions/setup-python@v7
   #       with:
   #         python-version: "3.12"
 

.github/workflows/labeler.yml

@@ -12,7 +12,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v6.2.0
+      - uses: actions/labeler@v7.0.0
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: true

.github/workflows/publish-pypi.yml

@@ -37,7 +37,7 @@ jobs:
     needs: prepare-environment
     steps:
       - name: "Set up Python"
-        uses: "actions/setup-python@v6"
+        uses: "actions/setup-python@v7"
         with:
           python-version: "3.12"
 

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
           submodules: true
 
       - name: "Set up Python"
-        uses: "actions/setup-python@v6"
+        uses: "actions/setup-python@v7"
         with:
           python-version: "3.12"
 

CHANGELOG.md

@@ -11,6 +11,22 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [1.22.2](https://github.com/opsmill/infrahub-sdk-python/tree/v1.22.2) - 2026-07-27
+
+### Added
+
+- Added a `--dependencies` flag to `infrahubctl marketplace get`. When downloading a schema or a collection, it now also resolves and downloads the schemas they depend on, via the marketplace API. Dependencies are grouped by the collection they belong to: prerequisite collections (and, for a single schema, dependencies that are members of a collection) are placed in their own `<collection>/` directory, while dependencies that belong to no collection land in the output root. Referenced kinds the marketplace cannot resolve are reported as unresolved dependencies. A schema that already exists in the output directory is reconciled to a single file rather than duplicated across directories — kept by default, or overwritten with the new `-y`/`--yes` flag. ([#1117](https://github.com/opsmill/infrahub-sdk-python/issues/1117))
+- Added `infrahubctl marketplace list`, `search`, and `show` commands for browsing schemas and collections on the Infrahub Marketplace.
+
+### Fixed
+
+- Branch names containing URL-significant characters (such as `#` or `/`) are now percent-encoded in the GraphQL URL, so requests against those branches resolve correctly instead of returning a 404. ([#1209](https://github.com/opsmill/infrahub-sdk-python/issues/1209))
+- Fixed several cases where `InfrahubClientSync` had drifted from `InfrahubClient`: sync `branch.merge` now applies the same 120-second minimum timeout floor as the async client, and sync `create(allow_upsert=True)` now excludes the `hfid` from the mutation payload to avoid server-side upsert overhead. Also corrected an incorrect "feature not supported" message on async artifact fetch and a resource-pool error message typo.
+
+### Housekeeping
+
+- Replaced `markdownlint-cli2` with [rumdl](https://github.com/rvben/rumdl) for markdown linting. This removes the Node.js/npm dependency for the markdown check, speeds up linting, and consolidates the configuration into `pyproject.toml` under `[tool.rumdl]`. ([#1138](https://github.com/opsmill/infrahub-sdk-python/issues/1138))
+
 ## [1.22.1](https://github.com/opsmill/infrahub-sdk-python/tree/v1.22.1) - 2026-07-03
 
 ### Added

changelog/1231.fixed.md

@@ -0,0 +1 @@
+Register the `infrahub_integration` pytest marker under its real name. It was registered as `infrahub_integraton`, so integration tests raised a `PytestUnknownMarkWarning` on every run and failed to collect under `--strict-markers`.

docs/docs/python-sdk/reference/compatibility.mdx

@@ -13,6 +13,7 @@ Each Infrahub release pins a specific SDK version. Using the matching SDK versio
 
 | Infrahub | Required SDK | Release date |
 | --- | --- | --- |
+| 1.10.x | >= 1.22.0 | June 2026 |
 | 1.9.x | >= 1.20.0 | April 2026 |
 | 1.8.x | >= 1.19.0 | March 2026 |
 | 1.7.x | >= 1.18.1 | January 2026 |
@@ -35,10 +36,25 @@ The table below shows the exact SDK version pinned to each Infrahub release.
 
 | Infrahub | SDK version | Infrahub release date |
 | --- | --- | --- |
+| 1.10.6 | 1.22.2 | 2026-07-28 |
+| 1.10.5 | 1.22.1 | 2026-07-15 |
+| 1.10.4 | 1.22.1 | 2026-07-13 |
+| 1.10.3 | 1.22.1 | 2026-07-08 |
+| 1.10.2 | 1.22.0 | 2026-07-03 |
+| 1.10.1 | 1.22.0 | 2026-07-01 |
+| 1.10.0 | 1.22.0 | 2026-06-23 |
+| 1.9.10 | 1.20.1 | 2026-07-07 |
+| 1.9.9 | 1.20.1 | 2026-06-23 |
+| 1.9.8 | 1.20.1 | 2026-06-09 |
+| 1.9.7 | 1.20.1 | 2026-06-03 |
+| 1.9.6 | 1.20.1 | 2026-05-20 |
+| 1.9.5 | 1.20.0 | 2026-05-18 |
+| 1.9.4 | 1.20.0 | 2026-05-13 |
 | 1.9.3 | 1.20.0 | 2026-05-05 |
 | 1.9.2 | 1.20.0 | 2026-04-30 |
 | 1.9.1 | 1.20.0 | 2026-04-29 |
 | 1.9.0 | 1.20.0 | 2026-04-24 |
+| 1.8.7 | 1.19.0 | 2026-06-04 |
 | 1.8.6 | 1.19.0 | 2026-04-21 |
 | 1.8.5 | 1.19.0 | 2026-04-17 |
 | 1.8.4 | 1.19.0 | 2026-04-02 |

docs/docs_generation/compatibility.py

@@ -74,6 +74,7 @@ class FeatureRequirement:
 # Mapping of Infrahub minor version series to minimum SDK versions.
 # Auto-updated by update_compatibility.py.
 VERSION_RANGES: list[VersionRange] = [
+    VersionRange(infrahub="1.10.x", min_sdk="1.22.0", date="June 2026"),
     VersionRange(infrahub="1.9.x", min_sdk="1.20.0", date="April 2026"),
     VersionRange(infrahub="1.8.x", min_sdk="1.19.0", date="March 2026"),
     VersionRange(infrahub="1.7.x", min_sdk="1.18.1", date="January 2026"),
@@ -90,10 +91,25 @@ class FeatureRequirement:
 # Detailed mapping of every Infrahub release to its pinned SDK version.
 # Auto-updated by update_compatibility.py.
 RELEASE_MAPPINGS: list[ReleaseMapping] = [
+    ReleaseMapping(infrahub="1.10.6", sdk="1.22.2", date="2026-07-28"),
+    ReleaseMapping(infrahub="1.10.5", sdk="1.22.1", date="2026-07-15"),
+    ReleaseMapping(infrahub="1.10.4", sdk="1.22.1", date="2026-07-13"),
+    ReleaseMapping(infrahub="1.10.3", sdk="1.22.1", date="2026-07-08"),
+    ReleaseMapping(infrahub="1.10.2", sdk="1.22.0", date="2026-07-03"),
+    ReleaseMapping(infrahub="1.10.1", sdk="1.22.0", date="2026-07-01"),
+    ReleaseMapping(infrahub="1.10.0", sdk="1.22.0", date="2026-06-23"),
+    ReleaseMapping(infrahub="1.9.10", sdk="1.20.1", date="2026-07-07"),
+    ReleaseMapping(infrahub="1.9.9", sdk="1.20.1", date="2026-06-23"),
+    ReleaseMapping(infrahub="1.9.8", sdk="1.20.1", date="2026-06-09"),
+    ReleaseMapping(infrahub="1.9.7", sdk="1.20.1", date="2026-06-03"),
+    ReleaseMapping(infrahub="1.9.6", sdk="1.20.1", date="2026-05-20"),
+    ReleaseMapping(infrahub="1.9.5", sdk="1.20.0", date="2026-05-18"),
+    ReleaseMapping(infrahub="1.9.4", sdk="1.20.0", date="2026-05-13"),
     ReleaseMapping(infrahub="1.9.3", sdk="1.20.0", date="2026-05-05"),
     ReleaseMapping(infrahub="1.9.2", sdk="1.20.0", date="2026-04-30"),
     ReleaseMapping(infrahub="1.9.1", sdk="1.20.0", date="2026-04-29"),
     ReleaseMapping(infrahub="1.9.0", sdk="1.20.0", date="2026-04-24"),
+    ReleaseMapping(infrahub="1.8.7", sdk="1.19.0", date="2026-06-04"),
     ReleaseMapping(infrahub="1.8.6", sdk="1.19.0", date="2026-04-21"),
     ReleaseMapping(infrahub="1.8.5", sdk="1.19.0", date="2026-04-17"),
     ReleaseMapping(infrahub="1.8.4", sdk="1.19.0", date="2026-04-02"),

infrahub_sdk/client.py

@@ -11,7 +11,7 @@
 from functools import wraps
 from time import sleep
 from typing import TYPE_CHECKING, Any, BinaryIO, Literal, TypedDict, TypeVar, overload
-from urllib.parse import urlencode
+from urllib.parse import quote, urlencode
 
 import httpx
 import ujson
@@ -278,7 +278,7 @@ def _graphql_url(
     ) -> str:
         url = f"{self.config.address}/graphql"
         if branch_name:
-            url += f"/{branch_name}"
+            url += f"/{quote(branch_name, safe='')}"
 
         url_params = {}
         if at:

infrahub_sdk/pytest_plugin/plugin.py

@@ -100,7 +100,7 @@ def pytest_configure(config: pytest.Config) -> None:
     config.addinivalue_line("markers", "infrahub_unit: Unit test for an Infrahub resource, works without dependencies")
     config.addinivalue_line(
         "markers",
-        "infrahub_integraton: Integation test for an Infrahub resource, depends on an Infrahub running instance",
+        "infrahub_integration: Integration test for an Infrahub resource, depends on an Infrahub running instance",
     )
     config.addinivalue_line("markers", "infrahub_check: Test related to an Infrahub Check")
     config.addinivalue_line("markers", "infrahub_graphql_query: Test related to an Infrahub GraphQL query")