Skip to content

Commit db7a308

Browse files
authored
Update mcp version 1.20.0 [II] (#16307)
* Update MCP version from 1.10.1 to 1.20.0 - Update mcp dependency: 1.10.1 -> 1.20.0 in requirements.txt, pyproject.toml, and CI config - Update uvicorn dependency: 0.29.0 -> 0.31.1 (required by MCP 1.20.0) - Update PyJWT constraint to support newer versions required by MCP - Update all CI pipeline references to MCP 1.20.0 - Add test to verify MCP version and import compatibility MCP 1.20.0 requires uvicorn >=0.31.1 and PyJWT >=2.10.1. MCP package remains Python >=3.10 only (no change to version constraint). * Update poetry.lock for MCP 1.20.0 * Fix MCP 1.20.0 dependency conflict: relax pydantic pin and regenerate poetry.lock - Updated pydantic constraint to support both Python 3.8 (<2.11) and Python 3.9+ (>=2.11) - Relaxed pydantic pin from ==2.10.2 to >=2.11,<3.0.0 in requirements.txt and CI files - Updated .circleci/config.yml to install pydantic >=2.11 instead of exact pin - Updated .github/workflows/test-mcp.yml to install MCP 1.20.0 - Regenerated poetry.lock with pydantic 2.12.4 compatible with MCP 1.20.0 - This resolves the CI ResolutionImpossible error where MCP required pydantic>=2.11
1 parent b6dbd4f commit db7a308

File tree

7 files changed

+4114
-190
lines changed

7 files changed

+4114
-190
lines changed

.circleci/config.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
pip install python-multipart
140140
pip install google-cloud-aiplatform
141141
pip install prometheus-client==0.20.0
142-
pip install "pydantic==2.10.2"
142+
pip install "pydantic>=2.11,<3.0.0"
143143
pip install "diskcache==5.6.1"
144144
pip install "Pillow==10.3.0"
145145
pip install "jsonschema==4.22.0"
@@ -251,7 +251,7 @@ jobs:
251251
pip install python-multipart
252252
pip install google-cloud-aiplatform
253253
pip install prometheus-client==0.20.0
254-
pip install "pydantic==2.10.2"
254+
pip install "pydantic>=2.11,<3.0.0"
255255
pip install "diskcache==5.6.1"
256256
pip install "Pillow==10.3.0"
257257
pip install "jsonschema==4.22.0"
@@ -358,7 +358,7 @@ jobs:
358358
pip install python-multipart
359359
pip install google-cloud-aiplatform
360360
pip install prometheus-client==0.20.0
361-
pip install "pydantic==2.10.2"
361+
pip install "pydantic>=2.11,<3.0.0"
362362
pip install "diskcache==5.6.1"
363363
pip install "Pillow==10.3.0"
364364
pip install "jsonschema==4.22.0"
@@ -732,7 +732,7 @@ jobs:
732732
pip install python-multipart
733733
pip install google-cloud-aiplatform
734734
pip install prometheus-client==0.20.0
735-
pip install "pydantic==2.10.2"
735+
pip install "pydantic>=2.11,<3.0.0"
736736
pip install "diskcache==5.6.1"
737737
pip install "Pillow==10.3.0"
738738
pip install "jsonschema==4.22.0"
@@ -883,8 +883,8 @@ jobs:
883883
pip install "pytest-cov==5.0.0"
884884
pip install "pytest-asyncio==0.21.1"
885885
pip install "respx==0.22.0"
886-
pip install "pydantic==2.10.2"
887-
pip install "mcp==1.10.1"
886+
pip install "pydantic>=2.11,<3.0.0"
887+
pip install "mcp==1.20.0"
888888
# Run pytest and generate JUnit XML report
889889
- run:
890890
name: Run tests
@@ -928,7 +928,7 @@ jobs:
928928
pip install "pytest-cov==5.0.0"
929929
pip install "pytest-asyncio==0.21.1"
930930
pip install "respx==0.22.0"
931-
pip install "pydantic==2.10.2"
931+
pip install "pydantic>=2.11,<3.0.0"
932932
pip install "boto3==1.36.0"
933933
# Run pytest and generate JUnit XML report
934934
- run:
@@ -974,7 +974,7 @@ jobs:
974974
pip install "pytest-cov==5.0.0"
975975
pip install "pytest-asyncio==0.21.1"
976976
pip install "respx==0.22.0"
977-
pip install "pydantic==2.10.2"
977+
pip install "pydantic>=2.11,<3.0.0"
978978
# Run pytest and generate JUnit XML report
979979
- run:
980980
name: Run tests
@@ -1150,8 +1150,8 @@ jobs:
11501150
pip install "pytest-asyncio==0.21.1"
11511151
pip install "respx==0.22.0"
11521152
pip install "hypercorn==0.17.3"
1153-
pip install "pydantic==2.10.2"
1154-
pip install "mcp==1.10.1"
1153+
pip install "pydantic>=2.11,<3.0.0"
1154+
pip install "mcp==1.20.0"
11551155
pip install "requests-mock>=1.12.1"
11561156
pip install "responses==0.25.7"
11571157
pip install "pytest-xdist==3.6.1"
@@ -1203,8 +1203,8 @@ jobs:
12031203
pip install "pytest-asyncio==0.21.1"
12041204
pip install "respx==0.22.0"
12051205
pip install "hypercorn==0.17.3"
1206-
pip install "pydantic==2.10.2"
1207-
pip install "mcp==1.10.1"
1206+
pip install "pydantic>=2.11,<3.0.0"
1207+
pip install "mcp==1.20.0"
12081208
pip install "requests-mock>=1.12.1"
12091209
pip install "responses==0.25.7"
12101210
pip install "pytest-xdist==3.6.1"
@@ -1562,7 +1562,7 @@ jobs:
15621562
pip install "pytest-asyncio==0.21.1"
15631563
pip install "pytest-cov==5.0.0"
15641564
pip install "tomli==2.2.1"
1565-
pip install "mcp==1.10.1"
1565+
pip install "mcp==1.20.0"
15661566
- run:
15671567
name: Run tests
15681568
command: |
@@ -2711,7 +2711,7 @@ jobs:
27112711
pip install "openai==1.100.1"
27122712
pip install "assemblyai==0.37.0"
27132713
python -m pip install --upgrade pip
2714-
pip install "pydantic==2.10.2"
2714+
pip install "pydantic>=2.11,<3.0.0"
27152715
pip install "pytest==7.3.1"
27162716
pip install "pytest-mock==3.12.0"
27172717
pip install "pytest-asyncio==0.21.1"
@@ -3103,7 +3103,7 @@ jobs:
31033103
pip install aiohttp
31043104
pip install "openai==1.100.1"
31053105
python -m pip install --upgrade pip
3106-
pip install "pydantic==2.10.2"
3106+
pip install "pydantic>=2.11,<3.0.0"
31073107
pip install "pytest==7.3.1"
31083108
pip install "pytest-mock==3.12.0"
31093109
pip install "pytest-asyncio==0.21.1"

.circleci/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ redis==5.2.1
88
redisvl==0.4.1
99
anthropic
1010
orjson==3.10.12 # fast /embedding responses
11-
pydantic==2.10.2
11+
pydantic>=2.11,<3.0.0
1212
google-cloud-aiplatform==1.43.0
1313
google-cloud-iam==2.19.1
1414
fastapi-sso==0.16.0
1515
uvloop==0.21.0
16-
mcp==1.10.1 # for MCP server
16+
mcp==1.20.0 # for MCP server
1717
semantic_router==0.1.10 # for auto-routing with litellm
1818
fastuuid==0.12.0
1919
responses==0.25.7 # for proxy client tests

.github/workflows/test-mcp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ jobs:
3333
poetry run pip install "pytest-cov==5.0.0"
3434
poetry run pip install "pytest-asyncio==0.21.1"
3535
poetry run pip install "respx==0.22.0"
36-
poetry run pip install "pydantic==2.10.2"
37-
poetry run pip install "mcp==1.10.1"
36+
poetry run pip install "pydantic>=2.11,<3.0.0"
37+
poetry run pip install "mcp==1.20.0"
3838
poetry run pip install pytest-xdist
3939

4040
- name: Setup litellm-enterprise as local package

0 commit comments

Comments
 (0)