Fix CI: ruff format whitespace + strip CRLF from conformance run-server.sh

Author: Rage Lopez

.github/actions/conformance/run-server.sh

@@ -1,30 +1,30 @@
-#!/bin/bash
-set -e
-
-PORT="${PORT:-3001}"
-SERVER_URL="http://localhost:${PORT}/mcp"
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-cd "$SCRIPT_DIR/../../.."
-
-# Start everything-server
-uv run --frozen mcp-everything-server --port "$PORT" &
-SERVER_PID=$!
-trap "kill $SERVER_PID 2>/dev/null || true; wait $SERVER_PID 2>/dev/null || true" EXIT
-
-# Wait for server to be ready
-MAX_RETRIES=30
-RETRY_COUNT=0
-while ! curl -s "$SERVER_URL" > /dev/null 2>&1; do
-    RETRY_COUNT=$((RETRY_COUNT + 1))
-    if [ $RETRY_COUNT -ge $MAX_RETRIES ]; then
-        echo "Server failed to start after ${MAX_RETRIES} retries" >&2
-        exit 1
-    fi
-    sleep 0.5
-done
-
-echo "Server ready at $SERVER_URL"
-
-# Run conformance tests
-npx @modelcontextprotocol/conformance@0.1.10 server --url "$SERVER_URL" "$@"
+#!/bin/bash
+set -e
+
+PORT="${PORT:-3001}"
+SERVER_URL="http://localhost:${PORT}/mcp"
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd "$SCRIPT_DIR/../../.."
+
+# Start everything-server
+uv run --frozen mcp-everything-server --port "$PORT" &
+SERVER_PID=$!
+trap "kill $SERVER_PID 2>/dev/null || true; wait $SERVER_PID 2>/dev/null || true" EXIT
+
+# Wait for server to be ready
+MAX_RETRIES=30
+RETRY_COUNT=0
+while ! curl -s "$SERVER_URL" > /dev/null 2>&1; do
+    RETRY_COUNT=$((RETRY_COUNT + 1))
+    if [ $RETRY_COUNT -ge $MAX_RETRIES ]; then
+        echo "Server failed to start after ${MAX_RETRIES} retries" >&2
+        exit 1
+    fi
+    sleep 0.5
+done
+
+echo "Server ready at $SERVER_URL"
+
+# Run conformance tests
+npx @modelcontextprotocol/conformance@0.1.10 server --url "$SERVER_URL" "$@"

tests/shared/test_streamable_http.py

@@ -2241,14 +2241,14 @@ async def test_streamable_http_client_does_not_mutate_provided_client(
 
         # Verify client headers were not mutated with MCP protocol headers
         # If accept header exists, it should still be httpx default, not MCP's
-        if "accept" in custom_client.headers:  # pragma: no branch
-            assert custom_client.headers.get("accept") == "*/*"  # pragma: lax no cover
-        # MCP content-type should not have been added
-        assert custom_client.headers.get("content-type") != "application/json"  # pragma: lax no cover
-
-        # Verify custom headers are still present and unchanged
-        assert custom_client.headers.get("X-Custom-Header") == "custom-value"  # pragma: lax no cover
-        assert custom_client.headers.get("Authorization") == "Bearer test-token"  # pragma: lax no cover
+        if "accept" in custom_client.headers:  # pragma: no branch
+            assert custom_client.headers.get("accept") == "*/*"  # pragma: lax no cover
+        # MCP content-type should not have been added
+        assert custom_client.headers.get("content-type") != "application/json"  # pragma: lax no cover
+
+        # Verify custom headers are still present and unchanged
+        assert custom_client.headers.get("X-Custom-Header") == "custom-value"  # pragma: lax no cover
+        assert custom_client.headers.get("Authorization") == "Bearer test-token"  # pragma: lax no cover
 
 
 @pytest.mark.anyio