Skip to content

Commit e5af1d5

Browse files
committed
Merge origin/main into fix-fastmcp-integration-tests
Resolved conflicts in: - tests/issues/test_188_concurrency.py: Adopted main branch's event-based concurrency testing approach - tests/server/fastmcp/test_integration.py: Adopted main branch's comprehensive integration tests using server examples All conflicts resolved and tests should pass.
2 parents 5966a61 + 3d67e72 commit e5af1d5

File tree

46 files changed

+1809
-880
lines changed

Some content is hidden

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

46 files changed

+1809
-880
lines changed

.github/workflows/shared.yml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Shared Checks
33
on:
44
workflow_call:
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
pre-commit:
811
runs-on: ubuntu-latest
@@ -26,6 +29,7 @@ jobs:
2629
test:
2730
runs-on: ${{ matrix.os }}
2831
timeout-minutes: 10
32+
continue-on-error: true
2933
strategy:
3034
matrix:
3135
python-version: ["3.10", "3.11", "3.12", "3.13"]
@@ -45,4 +49,26 @@ jobs:
4549

4650
- name: Run pytest
4751
run: uv run --frozen --no-sync pytest
48-
continue-on-error: true
52+
53+
# This must run last as it modifies the environment!
54+
- name: Run pytest with lowest versions
55+
run: |
56+
uv sync --all-extras --upgrade
57+
uv run --no-sync pytest
58+
env:
59+
UV_RESOLUTION: lowest-direct
60+
readme-snippets:
61+
runs-on: ubuntu-latest
62+
steps:
63+
- uses: actions/checkout@v4
64+
65+
- uses: astral-sh/setup-uv@v5
66+
with:
67+
enable-cache: true
68+
version: 0.7.2
69+
70+
- name: Install dependencies
71+
run: uv sync --frozen --all-extras --python 3.10
72+
73+
- name: Check README snippets are up to date
74+
run: uv run --frozen scripts/update_readme_snippets.py --check

.pre-commit-config.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ repos:
2323
types: [python]
2424
language: system
2525
pass_filenames: false
26+
exclude: ^README\.md$
2627
- id: pyright
2728
name: pyright
2829
entry: uv run pyright
@@ -40,3 +41,9 @@ repos:
4041
language: system
4142
files: ^(pyproject\.toml|uv\.lock)$
4243
pass_filenames: false
44+
- id: readme-snippets
45+
name: Check README snippets are up to date
46+
entry: uv run scripts/update_readme_snippets.py --check
47+
language: system
48+
files: ^(README\.md|examples/.*\.py|scripts/update_readme_snippets\.py)$
49+
pass_filenames: false

CONTRIBUTING.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,12 @@ uv run ruff check .
4040
uv run ruff format .
4141
```
4242

43-
7. Submit a pull request to the same branch you branched from
43+
7. Update README snippets if you modified example code:
44+
```bash
45+
uv run scripts/update_readme_snippets.py
46+
```
47+
48+
8. Submit a pull request to the same branch you branched from
4449

4550
## Code Style
4651

0 commit comments

Comments
 (0)