Skip to content

Commit 66530dd

Browse files
authored
Merge branch 'main' into fix/discovery-engine-search-mode-singleflight
2 parents b1b28f9 + 2e28e5d commit 66530dd

26 files changed

Lines changed: 1758 additions & 592 deletions

File tree

.agents/skills/adk-setup/SKILL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Set up the local development environment for ADK Python.
1010

1111
Check the following before proceeding:
1212

13-
1. **Python 3.11+**
13+
1. **Python 3.10+**
1414

1515
```bash
1616
python3 --version

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ jobs:
5252
uses: actions/cache/restore@v4
5353
with:
5454
path: contributing/samples/adk_team/adk_documentation/adk_release_analyzer/sessions.db
55-
key: analyzer-session-db
55+
key: analyzer-session-db-${{ github.run_id }}-${{ github.run_attempt }}
56+
restore-keys: |
57+
analyzer-session-db-
5658
5759
- name: Run Analyzing Script
5860
env:
@@ -88,4 +90,4 @@ jobs:
8890
uses: actions/cache/save@v4
8991
with:
9092
path: contributing/samples/adk_team/adk_documentation/adk_release_analyzer/sessions.db
91-
key: analyzer-session-db
93+
key: analyzer-session-db-${{ github.run_id }}-${{ github.run_attempt }}

AGENTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ For detailed architecture patterns, component descriptions, and core interfaces,
5151

5252
## Development Setup
5353

54-
The project uses `uv` for package management and Python 3.11+. Please refer to the **`adk-setup`** skill at `.agents/skills/adk-setup/SKILL.md` for detailed instructions.
54+
The project uses `uv` for package management and Python 3.10+. Please refer to the **`adk-setup`** skill at `.agents/skills/adk-setup/SKILL.md` for detailed instructions.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ part before or alongside your code PR.
133133
1. **Clone the repository:**
134134

135135
```shell
136-
gh repo clone google/adk-python -- -b v2
136+
gh repo clone google/adk-python
137137
cd adk-python
138138
```
139139

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](LICENSE)
44
[![PyPI version](https://img.shields.io/pypi/v/google-adk.svg)](https://pypi.org/project/google-adk/)
55
[![Python versions](https://img.shields.io/pypi/pyversions/google-adk.svg)](https://pypi.org/project/google-adk/)
6-
[![PyPI downloads](https://img.shields.io/pypi/dm/google-adk.svg)](https://pypi.org/project/google-adk/)
6+
[![PyPI downloads](https://static.pepy.tech/badge/google-adk/month)](https://pepy.tech/project/google-adk)
7+
[![Unit Tests](https://github.com/google/adk-python/actions/workflows/python-unit-tests.yml/badge.svg)](https://github.com/google/adk-python/actions/workflows/python-unit-tests.yml)
78
[![Docs](https://img.shields.io/badge/docs-latest-blue.svg)](https://google.github.io/adk-docs/)
89

910
<h2 align="center">
@@ -46,7 +47,7 @@ ______________________________________________________________________
4647
pip install google-adk
4748
```
4849

49-
**Requirements:** Python 3.11+.
50+
**Requirements:** Python 3.10+.
5051

5152
To install optional integrations, you can use the following command:
5253

contributing/samples/integrations/files_retrieval_agent/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ by retrieving relevant documents before generating a response.
1313

1414
## Prerequisites
1515

16-
- Python 3.11+
16+
- Python 3.10+
1717
- `google-genai >= 1.64.0` (required for `gemini-embedding-2-preview`
1818
support via the Vertex AI `embedContent` endpoint)
1919
- `llama-index-embeddings-google-genai >= 0.3.0`

contributing/samples/mcp/mcp_server_side_sampling/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The flow is as follows:
2323

2424
### Prerequisites
2525

26-
- Python 3.11+
26+
- Python 3.10+
2727
- `google-adk` library installed.
2828
- A configured OpenAI API key.
2929

contributing/samples/mcp/mcp_sse_mtls_agent/generate_mtls_certs.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
#!/bin/bash
2+
# Copyright 2026 Google LLC
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
216
set -e
317

418
# Directory where this script is located

scripts/run_precommit.sh

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

0 commit comments

Comments
 (0)