Skip to content

Commit 914e9c8

Browse files
authored
Merge branch 'strands-agents:main' into fix/mcp-embedded-resources
2 parents 3fc0cbb + 9213bc5 commit 914e9c8

File tree

92 files changed

+4513
-1765
lines changed

Some content is hidden

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

92 files changed

+4513
-1765
lines changed

.github/workflows/integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
aws-region: us-east-1
5353
mask-aws-account-id: true
5454
- name: Checkout head commit
55-
uses: actions/checkout@v4
55+
uses: actions/checkout@v5
5656
with:
5757
ref: ${{ github.event.pull_request.head.sha }} # Pull the commit from the forked repo
5858
persist-credentials: false # Don't persist credentials for subsequent actions

.github/workflows/pypi-publish-on-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
with:
2727
persist-credentials: false
2828

@@ -74,7 +74,7 @@ jobs:
7474

7575
steps:
7676
- name: Download all the dists
77-
uses: actions/download-artifact@v4
77+
uses: actions/download-artifact@v5
7878
with:
7979
name: python-package-distributions
8080
path: dist/

.github/workflows/test-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
LOG_LEVEL: DEBUG
5252
steps:
5353
- name: Checkout code
54-
uses: actions/checkout@v4
54+
uses: actions/checkout@v5
5555
with:
5656
ref: ${{ inputs.ref }} # Explicitly define which commit to check out
5757
persist-credentials: false # Don't persist credentials for subsequent actions
@@ -73,7 +73,7 @@ jobs:
7373
contents: read
7474
steps:
7575
- name: Checkout code
76-
uses: actions/checkout@v4
76+
uses: actions/checkout@v5
7777
with:
7878
ref: ${{ inputs.ref }}
7979
persist-credentials: false

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ This project uses [hatchling](https://hatch.pypa.io/latest/build/#hatchling) as
4949

5050
Alternatively, install development dependencies in a manually created virtual environment:
5151
```bash
52-
pip install -e ".[dev]" && pip install -e ".[litellm]"
52+
pip install -e ".[all]"
5353
```
5454

5555

pyproject.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies = [
3030
"botocore>=1.29.0,<2.0.0",
3131
"docstring_parser>=0.15,<1.0",
3232
"mcp>=1.11.0,<2.0.0",
33-
"pydantic>=2.0.0,<3.0.0",
33+
"pydantic>=2.4.0,<3.0.0",
3434
"typing-extensions>=4.13.2,<5.0.0",
3535
"watchdog>=6.0.0,<7.0.0",
3636
"opentelemetry-api>=1.30.0,<2.0.0",
@@ -57,8 +57,8 @@ dev = [
5757
"mypy>=1.15.0,<2.0.0",
5858
"pre-commit>=3.2.0,<4.4.0",
5959
"pytest>=8.0.0,<9.0.0",
60+
"pytest-cov>=6.0.0,<7.0.0",
6061
"pytest-asyncio>=1.0.0,<1.2.0",
61-
"pytest-cov>=4.1.0,<5.0.0",
6262
"pytest-xdist>=3.0.0,<4.0.0",
6363
"ruff>=0.12.0,<0.13.0",
6464
]
@@ -68,9 +68,8 @@ docs = [
6868
"sphinx-autodoc-typehints>=1.12.0,<2.0.0",
6969
]
7070
litellm = [
71-
"litellm>=1.73.1,<2.0.0",
72-
# https://github.com/BerriAI/litellm/issues/13711
73-
"openai<1.100.0",
71+
"litellm>=1.75.9,<2.0.0",
72+
"openai>=1.68.0,<1.102.0",
7473
]
7574
llamaapi = [
7675
"llama-api-client>=0.1.0,<1.0.0",
@@ -143,8 +142,8 @@ features = ["anthropic", "litellm", "llamaapi", "ollama", "openai", "otel", "mis
143142
extra-dependencies = [
144143
"moto>=5.1.0,<6.0.0",
145144
"pytest>=8.0.0,<9.0.0",
145+
"pytest-cov>=6.0.0,<7.0.0",
146146
"pytest-asyncio>=1.0.0,<1.2.0",
147-
"pytest-cov>=4.1.0,<5.0.0",
148147
"pytest-xdist>=3.0.0,<4.0.0",
149148
]
150149
extra-args = [

0 commit comments

Comments
 (0)