Merge remote-tracking branch 'upstream/main' into migrate-to-uv

Signed-off-by: Albert Callarisa <albert@diagrid.io>

Author: acroca

.github/scripts/automerge.py

@@ -12,6 +12,7 @@
 #
 
 name: Backport
+
 on:
   pull_request_target:
     types:
@@ -20,18 +21,6 @@ on:
 
 jobs:
   backport:
-    name: Backport
-    runs-on: ubuntu-latest
-    if: >
-      github.event.pull_request.merged
-      && (
-        github.event.action == 'closed'
-        || (
-          github.event.action == 'labeled'
-          && contains(github.event.label.name, 'backport')
-        )
-      )
-    steps:
-      - uses: tibdex/backport@9565281eda0731b1d20c4025c43339fb0a23812e
-        with:
-          github_token: ${{ secrets.DAPR_BOT_TOKEN }}
+    uses: dapr/.github/.github/workflows/backport.yaml@main
+    secrets:
+      dapr_bot_token: ${{ secrets.DAPR_BOT_TOKEN }}

.github/workflows/backport.yaml

@@ -17,53 +17,21 @@ on:
   schedule:
     - cron: '*/10 * * * *'
   workflow_dispatch:
+
 jobs:
   automerge:
-    if: github.repository_owner == 'dapr'
-    name: Automerge and update PRs.
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v6
-      - name: Install dependencies
-        run: pip install PyGithub
-      - name: Automerge and update
-        env:
-          MAINTAINERS: berndverst,wcs1only
-          GITHUB_TOKEN: ${{ secrets.DAPR_BOT_TOKEN }}
-        run: python ./.github/scripts/automerge.py
+    uses: dapr/.github/.github/workflows/automerge.yaml@main
+    with:
+      maintainer-teams: python-sdk-maintainers
+    secrets:
+      dapr_bot_token: ${{ secrets.DAPR_BOT_TOKEN }}
+
   prune_stale:
-    name: Prune Stale
-    runs-on: ubuntu-latest
-    steps:
-    - name: Prune Stale
-      uses: actions/stale@v5
-      with:
-        repo-token: ${{ secrets.DAPR_BOT_TOKEN }}
-        # Different amounts of days for issues/PRs are not currently supported but there is a PR
-        # open for it: https://github.com/actions/stale/issues/214
-        days-before-stale: 60
-        days-before-close: 7
-        stale-issue-message: >
-          This issue has been automatically marked as stale because it has not had activity in the
-          last 60 days. It will be closed in the next 7 days unless it is tagged (pinned, good first issue, help wanted or triaged/resolved) or other activity
-          occurs. Thank you for your contributions.
-        close-issue-message: >
-          This issue has been automatically closed because it has not had activity in the
-          last 67 days. If this issue is still valid, please ping a maintainer and ask them to label it as pinned, good first issue, help wanted or triaged/resolved.
-          Thank you for your contributions.
-        stale-pr-message: >
-          This pull request has been automatically marked as stale because it has not had
-          activity in the last 60 days. It will be closed in 7 days if no further activity occurs. Please
-          feel free to give a status update now, ping for review, or re-open when it's ready.
-          Thank you for your contributions!
-        close-pr-message: >
-          This pull request has been automatically closed because it has not had
-          activity in the last 67 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.
-          Thank you for your contributions!
-        stale-issue-label: 'stale'
-        exempt-issue-labels: 'pinned,good first issue,help wanted,triaged/resolved'
-        stale-pr-label: 'stale'
-        exempt-pr-labels: 'pinned'
-        operations-per-run: 500
-        ascending: true
+    uses: dapr/.github/.github/workflows/prune-stale.yaml@main
+    with:
+      days-before-issue-stale: 60
+      days-before-pr-stale: 60
+      days-before-issue-close: 7
+      days-before-pr-close: 7
+    secrets:
+      dapr_bot_token: ${{ secrets.DAPR_BOT_TOKEN }}

.github/workflows/dapr-bot-schedule.yml

@@ -29,13 +29,6 @@ jobs:
   validate:
     runs-on: ubuntu-latest
     env:
-      GOVER: 1.21
-      GOOS: linux
-      GOARCH: amd64
-      GOPROXY: https://proxy.golang.org
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/master/install/install.sh
-      DAPR_CLI_REF: ${{ github.event.inputs.daprcli_commit }}
-      DAPR_REF: ${{ github.event.inputs.daprdapr_commit }}
       CHECKOUT_REPO: ${{ github.repository }}
       CHECKOUT_REF: ${{ github.ref }}
 
@@ -50,7 +43,6 @@ jobs:
           if [ ${{ github.event.client_payload.command }} = "ok-to-test" ]; then
             echo "CHECKOUT_REPO=${{ github.event.client_payload.pull_head_repo }}" >> $GITHUB_ENV
             echo "CHECKOUT_REF=${{ github.event.client_payload.pull_head_ref }}" >> $GITHUB_ENV
-            echo "DAPR_REF=master" >> $GITHUB_ENV
           fi
 
       - name: Check out code onto GOPATH
@@ -96,68 +88,21 @@ jobs:
       - name: Install dependencies
         run: uv sync --frozen --all-packages --group examples
       - name: Set up Dapr CLI
-        run: |
-          wget -q "https://github.com/dapr/cli/releases/download/v${{ env.DAPR_CLI_VER }}/dapr_${{ env.GOOS }}_${{ env.GOARCH }}.tar.gz" -O /tmp/dapr.tar.gz
-          sudo tar xzf /tmp/dapr.tar.gz -C /usr/local/bin dapr
-          dapr --version
-      - name: Set up Go ${{ env.GOVER }}
-        if: env.DAPR_REF != '' || env.DAPR_CLI_REF != ''
-        uses: actions/setup-go@v6
+        uses: dapr/.github/.github/actions/setup-dapr-cli@main
+        with:
+          commit: ${{ github.event.inputs.daprcli_commit }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up Dapr runtime
+        uses: dapr/.github/.github/actions/setup-dapr-runtime@main
         with:
-          go-version: ${{ env.GOVER }}
+          commit: ${{ github.event.inputs.daprdapr_commit }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up Llama
         run: |
           curl -fsSL https://ollama.com/install.sh | sh
           nohup ollama serve &
           sleep 10
           ollama pull llama3.2:latest
-      - name: Checkout Dapr CLI repo to override dapr command.
-        uses: actions/checkout@v6
-        if: env.DAPR_CLI_REF != ''
-        with:
-          repository: dapr/cli
-          ref: ${{ env.DAPR_CLI_REF }}
-          path: cli
-      - name: Checkout Dapr repo to override daprd.
-        uses: actions/checkout@v6
-        if: env.DAPR_REF != ''
-        with:
-          repository: dapr/dapr
-          ref: ${{ env.DAPR_REF }}
-          path: dapr_runtime
-      - name: Build and override dapr cli with referenced commit.
-        if: env.DAPR_CLI_REF != ''
-        run: |
-          cd cli
-          make
-          sudo cp dist/linux_amd64/release/dapr /usr/local/bin/dapr
-          cd ..
-      - name: Initialize Dapr runtime ${{ env.DAPR_RUNTIME_VER }}
-        run: |
-          dapr uninstall --all
-          dapr init --runtime-version ${{ env.DAPR_RUNTIME_VER }}
-      - name: Build and override daprd with referenced commit.
-        if: env.DAPR_REF != ''
-        run: |
-          cd dapr_runtime
-          make
-          mkdir -p $HOME/.dapr/bin/
-          cp dist/linux_amd64/release/daprd $HOME/.dapr/bin/daprd
-          cd ..
-      - name: Override placement service.
-        if: env.DAPR_REF != ''
-        run: |
-          docker stop dapr_placement
-          cd dapr_runtime
-          ./dist/linux_amd64/release/placement --healthz-port 9091 &
-          cd ..
-      - name: Check Examples
+      - name: Check examples
         run: |
-          cd examples
-          for dir in */; do
-              dir="${dir%/}"
-              if [ -f "$dir/README.md" ]; then
-                  ./validate.sh "$dir"
-              fi
-          done
-          ./validate.sh ../
+          uv run pytest tests/integration/

.github/workflows/validate_examples.yaml

@@ -61,14 +61,14 @@ Each extension is a **separate PyPI package** with its own `pyproject.toml`, `se
 
 ## Examples (integration test suite)
 
-The `examples/` directory serves as both user-facing documentation and the project's integration test suite. Examples are validated in CI using [mechanical-markdown](https://pypi.org/project/mechanical-markdown/), which executes bash code blocks from README files and asserts expected output.
+The `examples/` directory serves as both user-facing documentation and the project's integration test suite. Examples are validated by pytest-based integration tests in `tests/integration/`.
 
-**See `examples/AGENTS.md`** for the full guide on example structure, validation, mechanical-markdown STEP blocks, and how to add new examples.
+**See `examples/AGENTS.md`** for the full guide on example structure and how to add new examples.
 
 Quick reference:
 ```bash
-cd examples && ./validate.sh state_store  # Run a single example
-cd examples && ./validate.sh conversation  # Run another example
+uv run pytest tests/integration/                       # Run all examples (needs Dapr runtime)
+uv run pytest tests/integration/test_state_store.py    # Run a single example
 ```
 
 ## Python version support
@@ -108,8 +108,8 @@ uv run ruff check --fix && uv run ruff format
 # Run type checking
 uv run mypy
 
-# Validate examples (requires Dapr runtime)
-cd examples && ./validate.sh <example-name>
+# Run integration tests / validate examples (requires Dapr runtime)
+uv run pytest tests/integration/
 ```
 
 ## Code style and linting
@@ -175,8 +175,8 @@ When completing any task on this project, work through this checklist. Not every
 ### Examples (integration tests)
 
 - [ ] If you added a new user-facing feature or building block, add or update an example in `examples/`
-- [ ] Ensure the example README has `<!-- STEP -->` blocks with `expected_stdout_lines` so it is validated in CI
-- [ ] If you changed output format of existing functionality, update `expected_stdout_lines` in affected example READMEs
+- [ ] Add a corresponding pytest integration test in `tests/integration/`
+- [ ] If you changed output format of existing functionality, update expected output in the affected integration tests
 - [ ] See `examples/AGENTS.md` for full details on writing examples
 
 ### Documentation
@@ -188,7 +188,7 @@ When completing any task on this project, work through this checklist. Not every
 
 - [ ] Run `uv run ruff check --fix && uv run ruff format` — linting must be clean
 - [ ] Run `uv run python -m unittest discover -v ./tests` — all unit tests must pass
-- [ ] If you touched examples: `cd examples && ./validate.sh <example-name>` to validate locally
+- [ ] If you touched examples: `uv run pytest tests/integration/test_<example-name>.py` to validate locally
 - [ ] Commits must be signed off for DCO: `git commit -s`
 
 ## Important files
@@ -200,7 +200,7 @@ When completing any task on this project, work through this checklist. Not every
 | `setup.py` | PyPI publish helper (handles dev version suffixing) |
 | `ext/*/pyproject.toml` | Extension package metadata and dependencies |
 | `dapr/version/version.py` | SDK version string |
-| `examples/validate.sh` | Entry point for mechanical-markdown example validation |
+| `tests/integration/` | Pytest-based integration tests that validate examples |
 
 ## Gotchas
 
@@ -209,6 +209,6 @@ When completing any task on this project, work through this checklist. Not every
 - **Extension independence**: Each extension is a separate PyPI package. Core SDK changes should not break extensions; extension changes should not require core SDK changes unless intentional.
 - **DCO signoff**: PRs will be blocked by the DCO bot if commits lack `Signed-off-by`. Always use `git commit -s`.
 - **Ruff version pinned**: `pyproject.toml` pins `ruff==0.14.1` in `[dependency-groups].dev`. Use `uv sync --all-packages --group dev` to get the exact version.
-- **Examples are integration tests**: Changing output format (log messages, print statements) can break example validation. Always check `expected_stdout_lines` in example READMEs when modifying user-visible output.
+- **Examples are integration tests**: Changing output format (log messages, print statements) can break integration tests. Always check expected output in `tests/integration/` when modifying user-visible output.
 - **Background processes in examples**: Examples that start background services (servers, subscribers) must include a cleanup step to stop them, or CI will hang.
 - **Workflow is the most active area**: See `ext/dapr-ext-workflow/AGENTS.md` for workflow-specific architecture and constraints.

AGENTS.md

@@ -1 +1,14 @@
 @AGENTS.md
+
+Use pathlib instead of os.path.
+Use httpx instead of urllib.
+subprocess(`shell=True`) is used only when it makes the code more readable. Use either shlex or args lists.
+subprocess calls should have a reasonable timeout.
+Use modern Python (3.10+) features.
+Make all code strongly typed.
+Keep conditional nesting to a minimum, and use guard clauses when possible.
+Aim for medium "visual complexity": use intermediate variables to store results of nested/complex function calls, but don't create a new variable for everything.
+Avoid comments unless there is a gotcha, a complex algorithm or anything an experienced code reviewer needs to be aware of. Focus on making better Google-style docstrings instead.
+
+The user is not always right. Be skeptical and do not blindly comply if something doesn't make sense.
+Code should be cross-platform and production ready.

CLAUDE.md

@@ -105,18 +105,17 @@ uv run python -m unittest discover -v ./tests
 uv run mypy
 ```
 
-7. Run examples
+7. Run integration tests (validates the examples)
 
 ```bash
-cd examples && ./validate.sh state_store
+uv run pytest tests/integration/
 ```
 
-[Dapr Mechanical Markdown](https://github.com/dapr/mechanical-markdown) is used to test the examples.
-
 If you need to run the examples against a pre-released version of the runtime, you can use the following command:
 - Get your daprd runtime binary from [here](https://github.com/dapr/dapr/releases) for your platform.
 - Copy the binary to your dapr home folder at $HOME/.dapr/bin/daprd.
 Or using dapr cli directly: `dapr init --runtime-version <release version>`
+- Now you can run the examples with `uv run pytest tests/integration/`.
 
 
 ## Documentation