Skip to content

Commit 1dd7f04

Browse files
sicoylesicoyle
committed
fix: address conflict with main again
Signed-off-by: Samantha Coyle <sam@diagrid.io>
2 parents 48cfb00 + 6f8b791 commit 1dd7f04

File tree

33 files changed

+570
-657
lines changed

33 files changed

+570
-657
lines changed

‎.github/actions/conformance/client.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ async def handle_callback(self) -> tuple[str, str | None]:
156156
@register("initialize")
157157
async def run_initialize(server_url: str) -> None:
158158
"""Connect, initialize, list tools, close."""
159-
async with streamable_http_client(url=server_url) as (read_stream, write_stream, _):
159+
async with streamable_http_client(url=server_url) as (read_stream, write_stream):
160160
async with ClientSession(read_stream, write_stream) as session:
161161
await session.initialize()
162162
logger.debug("Initialized successfully")
@@ -167,7 +167,7 @@ async def run_initialize(server_url: str) -> None:
167167
@register("tools_call")
168168
async def run_tools_call(server_url: str) -> None:
169169
"""Connect, initialize, list tools, call add_numbers(a=5, b=3), close."""
170-
async with streamable_http_client(url=server_url) as (read_stream, write_stream, _):
170+
async with streamable_http_client(url=server_url) as (read_stream, write_stream):
171171
async with ClientSession(read_stream, write_stream) as session:
172172
await session.initialize()
173173
await session.list_tools()
@@ -178,7 +178,7 @@ async def run_tools_call(server_url: str) -> None:
178178
@register("sse-retry")
179179
async def run_sse_retry(server_url: str) -> None:
180180
"""Connect, initialize, list tools, call test_reconnection, close."""
181-
async with streamable_http_client(url=server_url) as (read_stream, write_stream, _):
181+
async with streamable_http_client(url=server_url) as (read_stream, write_stream):
182182
async with ClientSession(read_stream, write_stream) as session:
183183
await session.initialize()
184184
await session.list_tools()
@@ -209,7 +209,7 @@ async def default_elicitation_callback(
209209
@register("elicitation-sep1034-client-defaults")
210210
async def run_elicitation_defaults(server_url: str) -> None:
211211
"""Connect with elicitation callback that applies schema defaults."""
212-
async with streamable_http_client(url=server_url) as (read_stream, write_stream, _):
212+
async with streamable_http_client(url=server_url) as (read_stream, write_stream):
213213
async with ClientSession(
214214
read_stream, write_stream, elicitation_callback=default_elicitation_callback
215215
) as session:
@@ -296,7 +296,7 @@ async def run_auth_code_client(server_url: str) -> None:
296296
async def _run_auth_session(server_url: str, oauth_auth: OAuthClientProvider) -> None:
297297
"""Common session logic for all OAuth flows."""
298298
client = httpx.AsyncClient(auth=oauth_auth, timeout=30.0)
299-
async with streamable_http_client(url=server_url, http_client=client) as (read_stream, write_stream, _):
299+
async with streamable_http_client(url=server_url, http_client=client) as (read_stream, write_stream):
300300
async with ClientSession(
301301
read_stream, write_stream, elicitation_callback=default_elicitation_callback
302302
) as session:

‎.github/workflows/claude-code-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2323
with:
2424
fetch-depth: 1
2525

‎.github/workflows/claude.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
actions: read # Required for Claude to read CI results on PRs
2828
steps:
2929
- name: Checkout repository
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v6
3131
with:
3232
fetch-depth: 1
3333

‎.github/workflows/comment-on-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
16+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
1717
with:
1818
fetch-depth: 0
1919

‎.github/workflows/conformance.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
runs-on: ubuntu-latest
1919
continue-on-error: true
2020
steps:
21-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
22-
- uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
21+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
22+
- uses: astral-sh/setup-uv@803947b9bd8e9f986429fa0c5a41c367cd732b41 # v7.2.1
2323
with:
2424
enable-cache: true
2525
version: 0.9.5
26-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
26+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
2727
with:
2828
node-version: 24
2929
- run: uv sync --frozen --all-extras --package mcp-everything-server
@@ -33,12 +33,12 @@ jobs:
3333
runs-on: ubuntu-latest
3434
continue-on-error: true
3535
steps:
36-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
37-
- uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
36+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
37+
- uses: astral-sh/setup-uv@803947b9bd8e9f986429fa0c5a41c367cd732b41 # v7.2.1
3838
with:
3939
enable-cache: true
4040
version: 0.9.5
41-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
41+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
4242
with:
4343
node-version: 24
4444
- run: uv sync --frozen --all-extras --package mcp

‎.github/workflows/publish-docs-manually.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ jobs:
99
permissions:
1010
contents: write
1111
steps:
12-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
12+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
1313
- name: Configure Git Credentials
1414
run: |
1515
git config user.name github-actions[bot]
1616
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
1717
1818
- name: Install uv
19-
uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
19+
uses: astral-sh/setup-uv@803947b9bd8e9f986429fa0c5a41c367cd732b41 # v7.2.1
2020
with:
2121
enable-cache: true
2222
version: 0.9.5
2323

2424
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
25-
- uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
25+
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
2626
with:
2727
key: mkdocs-material-${{ env.cache_id }}
2828
path: .cache

‎.github/workflows/publish-pypi.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
needs: [checks]
1212
steps:
13-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
13+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
1414

1515
- name: Install uv
16-
uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
16+
uses: astral-sh/setup-uv@803947b9bd8e9f986429fa0c5a41c367cd732b41 # v7.2.1
1717
with:
1818
enable-cache: true
1919
version: 0.9.5
@@ -58,20 +58,20 @@ jobs:
5858
permissions:
5959
contents: write
6060
steps:
61-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
61+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
6262
- name: Configure Git Credentials
6363
run: |
6464
git config user.name github-actions[bot]
6565
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
6666
6767
- name: Install uv
68-
uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
68+
uses: astral-sh/setup-uv@803947b9bd8e9f986429fa0c5a41c367cd732b41 # v7.2.1
6969
with:
7070
enable-cache: true
7171
version: 0.9.5
7272

7373
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
74-
- uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
74+
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
7575
with:
7676
key: mkdocs-material-${{ env.cache_id }}
7777
path: .cache

‎.github/workflows/shared.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
pre-commit:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
16+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
1717

18-
- uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
18+
- uses: astral-sh/setup-uv@803947b9bd8e9f986429fa0c5a41c367cd732b41 # v7.2.1
1919
with:
2020
enable-cache: true
2121
version: 0.9.5
@@ -44,10 +44,10 @@ jobs:
4444
os: [ubuntu-latest, windows-latest]
4545

4646
steps:
47-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
47+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
4848

4949
- name: Install uv
50-
uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
50+
uses: astral-sh/setup-uv@803947b9bd8e9f986429fa0c5a41c367cd732b41 # v7.2.1
5151
with:
5252
enable-cache: true
5353
version: 0.9.5
@@ -69,9 +69,9 @@ jobs:
6969
readme-snippets:
7070
runs-on: ubuntu-latest
7171
steps:
72-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
72+
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
7373

74-
- uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0
74+
- uses: astral-sh/setup-uv@803947b9bd8e9f986429fa0c5a41c367cd732b41 # v7.2.1
7575
with:
7676
enable-cache: true
7777
version: 0.9.5

‎.github/workflows/weekly-lockfile-update.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
update-lockfile:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v6.0.1
17+
- uses: actions/checkout@v6
1818

19-
- uses: astral-sh/setup-uv@v7.2.0
19+
- uses: astral-sh/setup-uv@v7.2.1
2020
with:
2121
version: 0.9.5
2222

@@ -29,7 +29,7 @@ jobs:
2929
echo '```' >> pr_body.md
3030
3131
- name: Create pull request
32-
uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v7
32+
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v7
3333
with:
3434
commit-message: "chore: update uv.lock with latest dependencies"
3535
title: "chore: weekly dependency update"

‎CLAUDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This document contains critical information about working with this codebase. Fo
1717
- Functions must be focused and small
1818
- Follow existing patterns exactly
1919
- Line length: 120 chars maximum
20-
- FORBIDDEN: imports inside functions
20+
- FORBIDDEN: imports inside functions. THEY SHOULD BE AT THE TOP OF THE FILE.
2121

2222
3. Testing Requirements
2323
- Framework: `uv run --frozen pytest`

0 commit comments

Comments
 (0)