Resolve merge conflicts

Author: ogenstad

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
       github_workflows: ${{ steps.changes.outputs.github_workflows }}
     steps:
       - name: "Check out repository code"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
       - name: Check for file changes
         uses: dorny/paths-filter@v3
         id: changes
@@ -63,26 +63,34 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: "Check out repository code"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
       - name: "Setup environment"
         run: "pip install yamllint==1.35.1"
       - name: "Linting: yamllint"
         run: "yamllint -s ."
 
   python-lint:
     if: needs.files-changed.outputs.python == 'true'
-    needs: ["files-changed"]
+    needs: ["files-changed", "prepare-environment"]
     runs-on: "ubuntu-latest"
     timeout-minutes: 5
     steps:
       - name: "Check out repository code"
         uses: "actions/checkout@v5"
-      - name: "Setup environment"
-        run: "pip install ruff==0.11.0"
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.12"
+      - name: Install UV
+        uses: astral-sh/setup-uv@v7
+        with:
+          version: "${{ needs.prepare-environment.outputs.UV_VERSION }}"
+      - name: Install dependencies
+        run: uv sync --group lint
       - name: "Linting: ruff check"
-        run: "ruff check ."
+        run: "uv run ruff check ."
       - name: "Linting: ruff format"
-        run: "ruff format --check --diff ."
+        run: "uv run ruff format --check --diff ."
 
 
   markdown-lint:
@@ -94,9 +102,9 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: "Check out repository code"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
       - name: "Linting: markdownlint"
-        uses: DavidAnson/markdownlint-cli2-action@v20
+        uses: DavidAnson/markdownlint-cli2-action@v21
         with:
           config: .markdownlint.yaml
           globs: |
@@ -110,7 +118,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: "Check out repository code"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
       - name: Check workflow files
         run: |
           bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
@@ -156,7 +164,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: "Check out repository code"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           submodules: true
       - name: Install NodeJS
@@ -172,7 +180,7 @@ jobs:
         with:
           python-version: "3.12"
       - name: Install UV
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v7
         with:
           version: "${{ needs.prepare-environment.outputs.UV_VERSION }}"
       - name: Install dependencies
@@ -191,15 +199,15 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: "Check out repository code"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           submodules: true
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
           python-version: "3.12"
       - name: Install UV
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v7
         with:
           version: "${{ needs.prepare-environment.outputs.UV_VERSION }}"
       - name: Install dependencies
@@ -217,7 +225,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: "Check out repository code"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           submodules: true
 
@@ -239,7 +247,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
@@ -254,15 +261,16 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: "Check out repository code"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install UV
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v7
         with:
           version: "${{ needs.prepare-environment.outputs.UV_VERSION }}"
+          python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: uv sync --all-groups --all-extras
       - name: Mypy Tests
@@ -301,7 +309,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: "Check out repository code"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -311,7 +319,7 @@ jobs:
           RUNNER_NAME=$(echo "${{ runner.name }}" | grep -o 'ghrunner[0-9]\+' | sed 's/ghrunner\([0-9]\+\)/ghrunner_\1/')
           echo "PYTEST_DEBUG_TEMPROOT=/var/lib/github/${RUNNER_NAME}/_temp" >> $GITHUB_ENV
       - name: Install UV
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v7
         with:
           version: "${{ needs.prepare-environment.outputs.UV_VERSION }}"
       - name: Install dependencies
@@ -339,14 +347,14 @@ jobs:
   #   timeout-minutes: 30
   #   steps:
   #     - name: "Check out repository code"
-  #       uses: "actions/checkout@v5"
+  #       uses: "actions/checkout@v6"
 
   #     - name: "Extract target branch name"
   #       id: extract_branch
   #       run: echo "TARGET_BRANCH=${{ github.base_ref }}" >> $GITHUB_ENV
 
   #     - name: "Checkout infrahub repository"
-  #       uses: "actions/checkout@v5"
+  #       uses: "actions/checkout@v6"
   #       with:
   #         repository: "opsmill/infrahub"
   #         path: "infrahub-server"

.github/workflows/labels.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       -
         name: Run Labeler
         uses: crazy-max/ghaction-github-labeler@v5

.github/workflows/publish-pypi.yml

@@ -46,8 +46,8 @@ jobs:
         with:
           version: ${{ needs.prepare-environment.outputs.UV_VERSION }}
 
-      - name: Check out repository code
-        uses: "actions/checkout@v5"
+      - name: "Check out repository code"
+        uses: "actions/checkout@v6"
         with:
           submodules: true
 

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       latest_tag: ${{ steps.release.outputs.latest_tag }}
     steps:
       - name: "Check out repository code"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           submodules: true
 

.github/workflows/repository-dispatch.yml

@@ -42,7 +42,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Repository Dispatch
         uses: peter-evans/repository-dispatch@v4

.github/workflows/sync-docs.yml

@@ -16,12 +16,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: source-repo
 
       - name: Checkout target repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: opsmill/infrahub-docs
           token: ${{ secrets.PAT_TOKEN }}

.github/workflows/update-submodule.yml

@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Trigger submodule update
         run: |

CHANGELOG.md

@@ -11,6 +11,22 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [1.16.0](https://github.com/opsmill/infrahub-sdk-python/tree/v1.16.0) - 2025-12-01
+
+### Added
+
+- Added infrahubctl branch report command to help with cleaning up branches in Infrahub.
+
+### Changed
+
+- Updated behaviour for recursive lookups for the conversion of nested relationships. Note that this change could cause issues in transforms or generators that use the convert_query_response feature if "id" or "__typename" isn't requested for nested related objects. ([#389](https://github.com/opsmill/infrahub-sdk-python/issues/389))
+- The project now uses `uv` instead of `poetry` for package and dependency management.
+
+### Removed
+
+- Remove `is_visible` property from infrahub
+- Removed support for Python 3.9 (end of life)
+
 ## [1.15.1](https://github.com/opsmill/infrahub-sdk-python/tree/v1.15.1) - 2025-11-13
 
 ### Fixed

docs/_templates/sdk_template_reference.j2

@@ -9,7 +9,7 @@ The following filters are those that are [shipped with Jinja2](https://jinja.pal
 
 <!-- vale off -->
 | Name | Trusted |
-|----------|----------|
+| ---- | ------- |
 {% for filter in builtin %}
 | {{ filter.name }} | {% if filter.trusted %}✅{% else %}❌{% endif %} |
 {% endfor %}
@@ -20,7 +20,7 @@ The following filters are those that are [shipped with Jinja2](https://jinja.pal
 The following Jinja2 filters from <a href="https://netutils.readthedocs.io">Netutils</a> are included within Infrahub.
 <!-- vale off -->
 | Name | Trusted |
-|----------|----------|
+| ---- | ------- |
 {% for filter in netutils %}
 | {{ filter.name }} | {% if filter.trusted %}✅{% else %}❌{% endif %} |
 {% endfor %}

docs/docs/infrahubctl/infrahubctl-branch.mdx

@@ -23,6 +23,7 @@ $ infrahubctl branch [OPTIONS] COMMAND [ARGS]...
 * `list`: List all existing branches.
 * `merge`: Merge a Branch with main.
 * `rebase`: Rebase a Branch with main.
+* `report`: Generate branch cleanup status report.
 * `validate`: Validate if a branch has some conflict and...
 
 ## `infrahubctl branch create`
@@ -118,6 +119,26 @@ $ infrahubctl branch rebase [OPTIONS] BRANCH_NAME
 * `--config-file TEXT`: [env var: INFRAHUBCTL_CONFIG; default: infrahubctl.toml]
 * `--help`: Show this message and exit.
 
+## `infrahubctl branch report`
+
+Generate branch cleanup status report.
+
+**Usage**:
+
+```console
+$ infrahubctl branch report [OPTIONS] BRANCH_NAME
+```
+
+**Arguments**:
+
+* `BRANCH_NAME`: Branch name to generate report for  [required]
+
+**Options**:
+
+* `--update-diff`: Update diff before generating report
+* `--config-file TEXT`: [env var: INFRAHUBCTL_CONFIG; default: infrahubctl.toml]
+* `--help`: Show this message and exit.
+
 ## `infrahubctl branch validate`
 
 Validate if a branch has some conflict and is passing all the tests (NOT IMPLEMENTED YET).