Skip to content

Commit 88861d2

Browse files
authored
Merge branch 'main' into add-display-name-to-sessions
2 parents d18c287 + 4a88804 commit 88861d2

File tree

338 files changed

+27324
-7350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

338 files changed

+27324
-7350
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "1.25.1"
3+
}

.github/release-please-config.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
3+
"last-release-sha": "9f7d5b3f1476234e552b783415527cc4bac55b39",
4+
"packages": {
5+
".": {
6+
"release-type": "python",
7+
"package-name": "google-adk",
8+
"include-component-in-tag": false,
9+
"skip-github-release": true,
10+
"changelog-path": "CHANGELOG.md",
11+
"changelog-sections": [
12+
{"type": "feat", "section": "Features"},
13+
{"type": "fix", "section": "Bug Fixes"},
14+
{"type": "perf", "section": "Performance Improvements"},
15+
{"type": "refactor", "section": "Code Refactoring"},
16+
{"type": "docs", "section": "Documentation"},
17+
{"type": "test", "section": "Tests", "hidden": true},
18+
{"type": "build", "section": "Build System", "hidden": true},
19+
{"type": "ci", "section": "CI/CD", "hidden": true},
20+
{"type": "style", "section": "Styles", "hidden": true},
21+
{"type": "chore", "section": "Miscellaneous Chores", "hidden": true}
22+
]
23+
}
24+
}
25+
}

.github/release-please.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/release-trigger.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/analyze-releases-for-adk-docs-updates.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
python-version: '3.11'
2525

2626
- name: Load adk-bot SSH Private Key
27-
uses: webfactory/ssh-agent@v0.9.0
27+
uses: webfactory/ssh-agent@v0.9.1
2828
with:
2929
ssh-private-key: ${{ secrets.ADK_BOT_SSH_PRIVATE_KEY }}
3030

.github/workflows/isort.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Set up Python
3434
uses: actions/setup-python@v6
3535
with:
36-
python-version: '3.x'
36+
python-version: '3.11'
3737

3838
- name: Install isort
3939
run: |
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
name: Mypy New Error Check
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
9+
10+
jobs:
11+
mypy-diff:
12+
runs-on: ubuntu-latest
13+
strategy:
14+
matrix:
15+
python-version: ['3.10', '3.11', '3.12', '3.13',]
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v6
19+
with:
20+
fetch-depth: 0
21+
22+
- name: Set up Python
23+
uses: actions/setup-python@v6
24+
with:
25+
python-version: ${{ matrix.python-version }}
26+
27+
- name: Install uv
28+
uses: astral-sh/setup-uv@v7
29+
30+
- name: Generate Baseline (Main)
31+
run: |
32+
# Switch to main branch to generate baseline
33+
git checkout origin/main
34+
35+
git checkout ${{ github.sha }} -- pyproject.toml
36+
37+
# Install dependencies for main
38+
uv venv .venv
39+
source .venv/bin/activate
40+
uv sync --all-extras
41+
42+
# Run mypy, filter for errors only, remove line numbers (file:123: -> file::), and sort
43+
# We ignore exit code (|| true) because we expect errors on main
44+
uv run mypy . | grep "error:" | sed 's/:\([0-9]\+\):/::/g' | sort > main_errors.txt || true
45+
46+
echo "Found $(wc -l < main_errors.txt) errors on main."
47+
48+
- name: Check PR Branch
49+
run: |
50+
# Switch back to the PR commit
51+
git checkout ${{ github.sha }}
52+
53+
# Re-sync dependencies in case the PR changed them
54+
source .venv/bin/activate
55+
uv sync --all-extras
56+
57+
# Run mypy on PR code, apply same processing
58+
uv run mypy . | grep "error:" | sed 's/:\([0-9]\+\):/::/g' | sort > pr_errors.txt || true
59+
60+
echo "Found $(wc -l < pr_errors.txt) errors on PR branch."
61+
62+
- name: Compare and Fail on New Errors
63+
run: |
64+
# 'comm -13' suppresses unique lines in file1 (main) and common lines,
65+
# leaving only lines unique to file2 (PR) -> The new errors.
66+
comm -13 main_errors.txt pr_errors.txt > new_errors.txt
67+
68+
if [ -s new_errors.txt ]; then
69+
echo "::error::The following NEW mypy errors were introduced:"
70+
cat new_errors.txt
71+
exit 1
72+
else
73+
echo "Great job! No new mypy errors introduced."
74+
fi

.github/workflows/mypy.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Mypy Type Check
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
9+
jobs:
10+
mypy:
11+
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
python-version: ['3.10', '3.11', '3.12', '3.13',]
15+
16+
steps:
17+
- uses: actions/checkout@v6
18+
19+
- name: Install uv
20+
uses: astral-sh/setup-uv@v7
21+
22+
- name: Set up Python
23+
uses: actions/setup-python@v6
24+
with:
25+
python-version: ${{ matrix.python-version }}
26+
27+
- name: Install dependencies
28+
run: uv sync --all-extras
29+
30+
- name: Run mypy
31+
32+
run: uv run mypy . --strict

.github/workflows/pyink.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Set up Python
3434
uses: actions/setup-python@v6
3535
with:
36-
python-version: '3.x'
36+
python-version: '3.11'
3737

3838
- name: Install pyink
3939
run: |

.github/workflows/python-unit-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
strategy:
2727
matrix:
28-
python-version: ["3.10", "3.11", "3.12", "3.13"]
28+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
2929

3030
steps:
3131
- name: Checkout code
@@ -37,7 +37,7 @@ jobs:
3737
python-version: ${{ matrix.python-version }}
3838

3939
- name: Install the latest version of uv
40-
uses: astral-sh/setup-uv@v6
40+
uses: astral-sh/setup-uv@v7
4141

4242
- name: Install dependencies
4343
run: |

0 commit comments

Comments
 (0)