Merge branch 'main' into client_notif_support

Author: maxisbey

.git-blame-ignore-revs

@@ -1,2 +1,5 @@
 # Applied 120 line-length rule to all files: https://github.com/modelcontextprotocol/python-sdk/pull/856
 543961968c0634e93d919d509cce23a1d6a56c21
+
+# Added 100% code coverage baseline with pragma comments: https://github.com/modelcontextprotocol/python-sdk/pull/1553
+89e9c43acf7e23cf766357d776ec1ce63ac2c58e

.gitattribute

@@ -1,2 +1,2 @@
 # Generated
-uv.lock  linguist-generated=true
+uv.lock  linguist-generated=true

.github/workflows/shared.yml

@@ -55,8 +55,11 @@ jobs:
       - name: Install the project
         run: uv sync ${{ matrix.dep-resolution.install-flags }} --all-extras --python ${{ matrix.python-version }}
 
-      - name: Run pytest
-        run: uv run ${{ matrix.dep-resolution.install-flags }} --no-sync pytest
+      - name: Run pytest with coverage
+        run: |
+          uv run ${{ matrix.dep-resolution.install-flags }} --no-sync coverage run -m pytest
+          uv run ${{ matrix.dep-resolution.install-flags }} --no-sync coverage combine
+          uv run ${{ matrix.dep-resolution.install-flags }} --no-sync coverage report
         env:
           UV_RESOLUTION: ${{ matrix.dep-resolution.name == 'lowest-direct' && 'lowest-direct' || 'highest' }}
 

.pre-commit-config.yaml

@@ -1,6 +1,11 @@
 fail_fast: true
 
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
+    hooks:
+      - id: end-of-file-fixer
+
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.1.0
     hooks:

examples/clients/simple-chatbot/mcp_simple_chatbot/requirements.txt

@@ -1,4 +1,4 @@
 python-dotenv>=1.0.0
 requests>=2.31.0
 mcp>=1.0.0
-uvicorn>=0.32.1
+uvicorn>=0.32.1

examples/clients/simple-chatbot/mcp_simple_chatbot/servers_config.json

@@ -9,4 +9,4 @@
       "args": ["-y", "@modelcontextprotocol/server-puppeteer"]
     }
   }
-}
+}

examples/servers/simple-prompt/mcp_simple_prompt/__init__.py

@@ -1 +0,0 @@
-

examples/servers/simple-resource/mcp_simple_resource/__init__.py

@@ -1 +0,0 @@
-

examples/servers/simple-tool/mcp_simple_tool/__init__.py

@@ -1 +0,0 @@
-

pyproject.toml

@@ -60,6 +60,7 @@ dev = [
     "pytest-pretty>=1.2.0",
     "inline-snapshot>=0.23.0",
     "dirty-equals>=0.9.0",
+    "coverage[toml]==7.10.7",
 ]
 docs = [
     "mkdocs>=1.6.1",
@@ -168,3 +169,40 @@ MD033 = false    # no-inline-html Inline HTML
 MD041 = false    # first-line-heading/first-line-h1
 MD046 = false    # indented-code-blocks
 MD059 = false    # descriptive-link-text
+
+# https://coverage.readthedocs.io/en/latest/config.html#run
+[tool.coverage.run]
+branch = true
+patch = ["subprocess"]
+concurrency = ["multiprocessing", "thread"]
+source = ["src", "tests"]
+relative_files = true
+omit = [
+    "src/mcp/client/__main__.py",
+    "src/mcp/server/__main__.py",
+    "src/mcp/os/posix/utilities.py",
+    "src/mcp/os/win32/utilities.py",
+]
+
+# https://coverage.readthedocs.io/en/latest/config.html#report
+[tool.coverage.report]
+fail_under = 100
+skip_covered = true
+show_missing = true
+ignore_errors = true
+precision = 2
+exclude_lines = [
+    "pragma: no cover",
+    "if TYPE_CHECKING:",
+    "@overload",
+    "raise NotImplementedError",
+    "^\\s*\\.\\.\\.\\s*$",
+]
+
+# https://coverage.readthedocs.io/en/latest/config.html#paths
+[tool.coverage.paths]
+source = [
+    "src/",
+    "/home/runner/work/python-sdk/python-sdk/src/",
+    'D:\a\python-sdk\python-sdk\src',
+]