Merge branch 'stable' into copilot/fix-optional-attributes-bug

Author: minitriga

.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,11 +42,11 @@ 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"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
       - name: Check for file changes
         uses: dorny/paths-filter@v3
         id: changes
@@ -63,26 +63,36 @@ 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"
+        uses: "actions/checkout@v6"
+      - 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 ."
+      - name: "Linting: ty check"
+        run: "uv run ty check ."
 
 
   markdown-lint:
@@ -94,9 +104,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@v22
         with:
           config: .markdownlint.yaml
           globs: |
@@ -110,7 +120,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)
@@ -119,6 +129,28 @@ jobs:
         env:
           SHELLCHECK_OPTS: --exclude=SC2086 --exclude=SC2046 --exclude=SC2004 --exclude=SC2129
 
+  uv-lock-check:
+    if: |
+      needs.files-changed.outputs.uv_files == 'true' ||
+      needs.files-changed.outputs.github_workflows == 'true'
+    needs:
+      - files-changed
+      - prepare-environment
+    runs-on: "ubuntu-latest"
+    timeout-minutes: 5
+    steps:
+      - name: "Check out repository code"
+        uses: "actions/checkout@v6"
+      - 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: "Validate pyproject.toml and consistency with uv.lock"
+        run: uv lock --locked --offline
 
   documentation:
     defaults:
@@ -129,12 +161,12 @@ 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:
       - name: "Check out repository code"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           submodules: true
       - name: Install NodeJS
@@ -145,10 +177,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: |
@@ -161,24 +201,21 @@ 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: "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: |
@@ -190,7 +227,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: "Check out repository code"
-        uses: "actions/checkout@v5"
+        uses: "actions/checkout@v6"
         with:
           submodules: true
 
@@ -212,11 +249,11 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
           - "3.13"
+          - "3.14"
     if: |
       always() && !cancelled() &&
       !contains(needs.*.result, 'failure') &&
@@ -227,29 +264,25 @@ 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: "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 +292,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 }}
 
@@ -280,7 +312,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:
@@ -289,19 +321,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 }}
 
@@ -320,14 +350,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/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/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