Merge branch 'main' into 0.6.0

airtai · Nov 26, 2024 · 308dc50 · 308dc50
2 parents d13624c + c75f001
commit 308dc50
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/docs_deploy.yaml b/.github/workflows/docs_deploy.yaml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - uses: actions/setup-python@v5

diff --git a/.github/workflows/docs_update-release-notes.yaml b/.github/workflows/docs_update-release-notes.yaml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Configure Git user

diff --git a/.github/workflows/pr_tests.yaml b/.github/workflows/pr_tests.yaml
@@ -38,14 +38,6 @@ jobs:
           path: ~/.cache/pre-commit
           key: pre-commit|${{ hashFiles('.pre-commit-config.yaml') }}
       - uses: pre-commit/action@v3.0.1
-        continue-on-error: true
-        with:
-          extra_args: --hook-stage manual --all-files
-      - name: Commit
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: "fix: add missing pre-commit changes"
-      - uses: pre-commit/action@v3.0.1
 
   test-basic:
     if: github.event.pull_request.draft == false
@@ -58,7 +50,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Set up Python
@@ -101,7 +93,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Set up Python
@@ -122,7 +114,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Set up Python
@@ -143,7 +135,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Set up Python
@@ -184,7 +176,7 @@ jobs:
           ALLOW_PLAINTEXT_LISTENER: "true"
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Set up Python
@@ -216,7 +208,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Set up Python
@@ -257,7 +249,7 @@ jobs:
           ALLOW_PLAINTEXT_LISTENER: "true"
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Set up Python
@@ -289,7 +281,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Set up Python
@@ -319,7 +311,7 @@ jobs:
           - 5672:5672
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Set up Python
@@ -351,7 +343,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Set up Python
@@ -381,7 +373,7 @@ jobs:
           - 4222:4222
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Set up Python
@@ -413,7 +405,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Set up Python
@@ -443,7 +435,7 @@ jobs:
           - 6379:6379
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Set up Python
@@ -483,7 +475,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - uses: actions/setup-python@v5

diff --git a/...hub/workflows/docs_update-references.yaml → ...pr_update-linting-and-api-references.yaml b/...hub/workflows/docs_update-references.yaml → ...pr_update-linting-and-api-references.yaml
@@ -1,13 +1,11 @@
-name: Generate API References documentation
+name: Run linting, update API References and commit changes
 
 on:
   pull_request_target:
     types:
       - opened
       - synchronize
       - ready_for_review
-    paths:
-      - faststream/**
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -17,30 +15,39 @@ permissions:
   contents: write
 
 jobs:
-  check-docs-changes:
+  check-linting-and-docs-changes:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: "3.12"
+      - name: Set $PY environment variable
+        run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
       - name: Install Dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         shell: bash
         # should install with `-e`
         run: |
           set -ux
           uv pip install --system -e .[dev]
+
+      - uses: pre-commit/action@v3.0.1
+        continue-on-error: true
+        with:
+          extra_args: --hook-stage manual --all-files
+
       - name: Run build docs
         run: bash scripts/build-docs.sh
+
       - name: Commit
         uses: stefanzweifel/git-auto-commit-action@v5
         with:

diff --git a/.github/workflows/publish_coverage.yaml b/.github/workflows/publish_coverage.yaml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: "3.9"
-      - uses: astral-sh/setup-uv@v3
+      - uses: astral-sh/setup-uv@v4
         with:
           version: "latest"
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -68,3 +68,4 @@ repos:
     -   id: detect-secrets
         args: ['--baseline', '.secrets.baseline']
         exclude: package.lock.json
+        stages: [pre-commit, pre-merge-commit, manual]