Merge pull request #613 from opsmill/infrahub-develop

Merge infrahub-develop into stable

Author: ogenstad

.github/workflows/ci.yml

@@ -138,15 +138,15 @@ jobs:
         with:
           submodules: true
       - name: Install NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: 20
           cache: 'npm'
           cache-dependency-path: docs/package-lock.json
       - name: "Install dependencies"
         run: npm install
       - name: "Setup Python environment"
-        run: "pip install invoke toml"
+        run: "pip install invoke"
       - name: "Build docs website"
         run: "invoke docs"
 
@@ -176,7 +176,7 @@ jobs:
       - name: "Install dependencies"
         run: "poetry install --no-interaction --no-ansi --extras ctl"
       - name: "Setup environment"
-        run: "pip install invoke toml"
+        run: "poetry run pip install invoke"
       - name: "Validate generated documentation"
         run: "poetry run invoke docs-validate"
 
@@ -236,7 +236,11 @@ jobs:
         run: |
           pipx install poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }} --python python${{ matrix.python-version }}
           poetry config virtualenvs.create true --local
-          pip install invoke toml codecov
+          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"
@@ -289,7 +293,7 @@ jobs:
         run: |
           pipx install poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }}
           poetry config virtualenvs.create true --local
-          pip install invoke toml codecov
+          pip install invoke codecov
       - name: "Install Package"
         run: "poetry install --all-extras"
       - name: "Integration Tests"
@@ -362,7 +366,7 @@ jobs:
   #       run: |
   #         pipx install poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }}
   #         poetry config virtualenvs.create true --local
-  #         pip install invoke toml codecov
+  #         pip install invoke codecov
 
   #     - name: "Install Package"
   #       run: "poetry install --all-extras"

.github/workflows/repository-dispatch.yml

@@ -45,7 +45,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v3
+        uses: peter-evans/repository-dispatch@v4
         with:
           token: ${{ secrets.GH_UPDATE_PACKAGE_OTTO }}
           # if matrix.repo contains a slash, use it literally; otherwise look up the secret named by matrix.repo

.pre-commit-config.yaml

@@ -0,0 +1,22 @@
+---
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: trailing-whitespace
+      - id: check-ast
+      - id: check-case-conflict
+      - id: check-merge-conflict
+      - id: check-toml
+      - id: check-yaml
+      - id: end-of-file-fixer
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.11.9
+    hooks:
+      # Run the linter.
+      - id: ruff
+        args: [--fix]
+      # Run the formatter.
+      - id: ruff-format

.vale/styles/Infrahub/branded-terms-case-swap.yml

@@ -13,7 +13,6 @@ swap:
   (?:[Gg]itlab): GitLab
   (?:gitpod): GitPod
   (?:grafana): Grafana
-  (?:[^/][Gg]raphql): GraphQL
   (?:[Ii]nflux[Dd]b): InfluxDB
   infrahub(?:\s|$): Infrahub
   (?:jinja2): Jinja2

changelog/+branch-graph-version-status.added.md

@@ -0,0 +1 @@
+Add `graph_version` and `status` properties to `Branch`

changelog/+convert-object-type.added.md

@@ -0,0 +1 @@
+Add `convert_object_type` method to allow converting an object to another type.

changelog/+f6791a3d.added.md

@@ -0,0 +1 @@
+Added deprecation warnings when loading or checking schemas

changelog/+gql-command.added.md

@@ -0,0 +1 @@
+Add `infrahubctl graphql` commands to export schema and generate Pydantic types from GraphQL queries

changelog/380.fixed.md

@@ -0,0 +1 @@
+Replaced the `Sync` word in the protocol schema name so that the correct kind can be gotten from the cache

changelog/464.housekeeping.md

@@ -0,0 +1 @@
+Handle error gracefully when loading schema instead of failing with an exception