Merge pull request #671 from opsmill/wvd-20251201-release-1.16

Prep release v1.16.0

Author: wvandeun

.github/file-filters.yml

@@ -13,9 +13,9 @@ development_files: &development_files
   - "development/**"
   - "tasks/**"
 
-poetry_files: &poetry_files
+uv_files: &uv_files
   - "pyproject.toml"
-  - "poetry.lock"
+  - "uv.lock"
 
 doc_files: &doc_files
   - "docs/**"
@@ -24,7 +24,7 @@ doc_files: &doc_files
 
 python_all: &python_all
   - "**/*.py"
-  - *poetry_files
+  - *uv_files
   - *ci_config
   - *coverage_config
 

.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
       helm: ${{ steps.changes.outputs.helm_all }}
       python: ${{ steps.changes.outputs.python_all }}
       yaml: ${{ steps.changes.outputs.yaml_all }}
-      poetry_files: ${{ steps.changes.outputs.poetry_files }}
+      uv_files: ${{ steps.changes.outputs.uv_files }}
       github_workflows: ${{ steps.changes.outputs.github_workflows }}
     steps:
       - name: "Check out repository code"
@@ -71,18 +71,26 @@ jobs:
 
   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@v6"
-      - name: "Setup environment"
-        run: "pip install ruff==0.11.0"
+        uses: "actions/checkout@v5"
+      - 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:
@@ -129,7 +137,7 @@ jobs:
       !contains(needs.*.result, 'failure') &&
       !contains(needs.*.result, 'cancelled') &&
       needs.files-changed.outputs.documentation == 'true'
-    needs: ["files-changed", "yaml-lint", "python-lint"]
+    needs: ["prepare-environment", "files-changed", "yaml-lint", "python-lint"]
     runs-on: "ubuntu-22.04"
     timeout-minutes: 5
     steps:
@@ -145,10 +153,18 @@ jobs:
           cache-dependency-path: docs/package-lock.json
       - name: "Install dependencies"
         run: npm install
-      - name: "Setup Python environment"
-        run: "pip install invoke"
+      - 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 --all-groups --all-extras
       - name: "Build docs website"
-        run: "invoke docs"
+        run: "uv run invoke docs"
 
   validate-generated-documentation:
     if: |
@@ -168,17 +184,14 @@ jobs:
         uses: actions/setup-python@v6
         with:
           python-version: "3.12"
-      - name: "Setup Python environment"
-        run: |
-          pipx install poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }}
-          poetry config virtualenvs.create true --local
-          poetry env use 3.12
-      - name: "Install dependencies"
-        run: "poetry install --no-interaction --no-ansi --extras ctl"
-      - name: "Setup environment"
-        run: "poetry run pip install invoke"
-      - name: "Validate generated documentation"
-        run: "poetry run invoke docs-validate"
+      - name: Install UV
+        uses: astral-sh/setup-uv@v7
+        with:
+          version: "${{ needs.prepare-environment.outputs.UV_VERSION }}"
+      - name: Install dependencies
+        run: uv sync --all-groups --all-extras
+      - name: Validate generated documentation
+        run: uv run invoke docs-validate
 
   validate-documentation-style:
     if: |
@@ -212,7 +225,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
@@ -232,24 +244,20 @@ jobs:
         uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
-      - name: "Setup environment"
-        run: |
-          pipx install poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }} --python python${{ matrix.python-version }}
-          poetry config virtualenvs.create true --local
-          pip install invoke codecov
-      - name: "Install tomli for Python < 3.11"
-        if: matrix.python-version == '3.9' || matrix.python-version == '3.10'
-        run: |
-          pip install tomli
-      - name: "Install Package"
-        run: "poetry install --all-extras"
-      - name: "Mypy Tests"
-        run: "poetry run mypy --show-error-codes infrahub_sdk/"
-      - name: "Unit Tests"
-        run: "poetry run pytest --cov infrahub_sdk tests/unit/"
+      - name: Install UV
+        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
+        run: uv run mypy --show-error-codes infrahub_sdk/
+      - name: Unit Tests
+        run: uv run pytest --cov infrahub_sdk tests/unit/
       - name: "Upload coverage to Codecov"
         run: |
-          codecov --flags python-${{ matrix.python-version }}
+          uv run codecov --flags python-${{ matrix.python-version }}
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
@@ -259,11 +267,10 @@ jobs:
       - name: "Report coverage for pytest-plugin"
         if: matrix.python-version == '3.12'
         run: |
-          source $(poetry env info --path)/bin/activate
-          coverage run --source=infrahub_sdk -m pytest tests/unit/pytest_plugin
-          coverage report -m
-          coverage xml
-          codecov --flags python-filler-${{ matrix.python-version }}
+          uv run coverage run --source=infrahub_sdk -m pytest tests/unit/pytest_plugin
+          uv run coverage report -m
+          uv run coverage xml
+          uv run codecov --flags python-filler-${{ matrix.python-version }}
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
@@ -289,19 +296,17 @@ jobs:
         run: |
           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: "Setup environment"
-        run: |
-          pipx install poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }}
-          poetry config virtualenvs.create true --local
-          pip install invoke codecov
-      - name: "Install Package"
-        run: "poetry install --all-extras"
-      - name: "Integration Tests"
-        run: |
-          poetry run pytest --cov infrahub_sdk tests/integration/
+      - name: Install UV
+        uses: astral-sh/setup-uv@v7
+        with:
+          version: "${{ needs.prepare-environment.outputs.UV_VERSION }}"
+      - name: Install dependencies
+        run: uv sync --all-groups --all-extras
+      - name: Integration Tests
+        run: uv run pytest --cov infrahub_sdk tests/integration/
       - name: "Upload coverage to Codecov"
         run: |
-          codecov --flags integration-tests
+          uv run codecov --flags integration-tests
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 

.github/workflows/define-versions.yml

@@ -4,8 +4,8 @@ name: "Define versions"
 on:
   workflow_call:
     outputs:
-      POETRY_VERSION:
-        value: "2.1.3"
+      UV_VERSION:
+        value: "0.9.8"
 
 jobs:
   prepare:

.github/workflows/publish-pypi.yml

@@ -41,39 +41,35 @@ jobs:
         with:
           python-version: "3.12"
 
-      - name: "Install Poetry"
-        uses: "snok/install-poetry@v1"
+      - name: Install UV
+        uses: astral-sh/setup-uv@v4
         with:
-          version: ${{ needs.prepare-environment.outputs.POETRY_VERSION }}
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-          installer-parallel: true
+          version: ${{ needs.prepare-environment.outputs.UV_VERSION }}
 
       - name: "Check out repository code"
         uses: "actions/checkout@v6"
         with:
           submodules: true
 
-      - name: "Cache poetry venv"
+      - name: Cache UV dependencies
         uses: "actions/cache@v4"
-        id: "cached-poetry-dependencies"
+        id: "cached-uv-dependencies"
         with:
-          path: "./python_sdk/.venv"
-          key: "venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}"
+          path: ".venv"
+          key: "venv-${{ runner.os }}-${{ hashFiles('uv.lock') }}"
 
-      - name: "Install Dependencies"
-        run: "poetry install"
-        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
+      - name: Install Dependencies
+        run: uv sync --all-groups --all-extras
+        if: steps.cached-uv-dependencies.outputs.cache-hit != 'true'
 
-      - name: "Add PyPI secret"
-        run: "poetry config pypi-token.pypi ${{ secrets.PYPI_TOKEN }}"
+      - name: Build package
+        run: uv build
 
-      - name: "Poetry build"
-        run: "poetry build"
+      - name: Show output
+        run: ls -la dist/
 
-      - name: "show output"
-        run: "ls -la dist/"
-
-      - name: "Poetry push PyPI"
+      - name: Publish to PyPI
         if: ${{ inputs.publish }}
-        run: "poetry publish"
+        env:
+          UV_PUBLISH_TOKEN: ${{ secrets.PYPI_TOKEN }}
+        run: uv publish

.github/workflows/release.yml

@@ -30,28 +30,22 @@ jobs:
         with:
           python-version: "3.12"
 
-      - name: "Install Poetry"
-        uses: "snok/install-poetry@v1"
+      - name: Install UV
+        uses: astral-sh/setup-uv@v4
         with:
-          version: ${{ needs.prepare-environment.outputs.POETRY_VERSION }}
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-          installer-parallel: true
+          version: "${{ needs.prepare-environment.outputs.UV_VERSION }}"
 
-      - name: "Setup Python environment"
-        run: |
-          poetry config virtualenvs.create true --local
-          poetry env use 3.12
-      - name: "Install dependencies"
-        run: "poetry install --no-interaction --no-ansi"
+      - name: Install dependencies
+        run: uv sync --all-groups --all-extras
 
-      - name: "Check prerelease type"
+      - name: Check prerelease type
         id: release
         run: |
-          echo is_prerelease=$(poetry run python -c "from packaging.version import Version; print(int(Version('$(poetry version -s)').is_prerelease))") >> "$GITHUB_OUTPUT"
-          echo is_devrelease=$(poetry run python -c "from packaging.version import Version; print(int(Version('$(poetry version -s)').is_devrelease))") >> "$GITHUB_OUTPUT"
-          echo "version=$(poetry version -s)" >> "$GITHUB_OUTPUT"
-          echo major_minor_version=$(poetry run python -c "from packaging.version import Version; print(f\"{Version('$(poetry version -s)').major}.{Version('$(poetry version -s)').minor}\")") >> "$GITHUB_OUTPUT"
+          VERSION=$(uv version --short)
+          echo is_prerelease=$(uv run python -c "from packaging.version import Version; print(int(Version('$VERSION').is_prerelease))") >> "$GITHUB_OUTPUT"
+          echo is_devrelease=$(uv run python -c "from packaging.version import Version; print(int(Version('$VERSION').is_devrelease))") >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo major_minor_version=$(uv run python -c "from packaging.version import Version; v = Version('$VERSION'); print(f'{v.major}.{v.minor}')") >> "$GITHUB_OUTPUT"
           echo latest_tag=$(curl -L \
               -H "Accept: application/vnd.github+json" \
               -H "Authorization: Bearer ${{ github.token }}" \
@@ -60,10 +54,14 @@ jobs:
               | jq -r '.tag_name') >> "$GITHUB_OUTPUT"
 
       - name: Check tag version
-        if: github.event.release.tag_name != format('v{0}', steps.release.outputs.version)
         run: |
-          echo "Tag version does not match python project version"
-          exit 1
+          EXPECTED_TAG="v${{ steps.release.outputs.version }}"
+          if [ "${{ github.event.release.tag_name }}" != "$EXPECTED_TAG" ]; then
+            echo "Tag version does not match python project version"
+            echo "Expected: $EXPECTED_TAG"
+            echo "Got: ${{ github.event.release.tag_name }}"
+            exit 1
+          fi
 
       - name: Check prerelease and project version
         if: github.event.release.prerelease == true && steps.release.outputs.is_prerelease == 0 && steps.release.outputs.is_devrelease == 0

.gitignore

@@ -8,6 +8,8 @@ script.py
 .vscode/settings.json
 .DS_Store
 .python-version
+.venv/
+.venv
 .ruff_cache
 **/.ruff_cache
 **/.idea/**

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