refactor: reuse docs version helpers

Author: ayhammouda

src/mcp_server_python_docs/__main__.py

@@ -66,6 +66,10 @@ def _consume_saved_stdout_fd() -> int:
 # === Now safe to import everything else ===
 import click  # noqa: E402
 
+from mcp_server_python_docs.ingestion.cpython_versions import (  # noqa: E402
+    SUPPORTED_DOC_VERSIONS_CSV,
+)
+
 
 @click.group(invoke_without_command=True)
 @click.option("--version", "show_version", is_flag=True, help="Show version and exit.")
@@ -105,7 +109,7 @@ def serve() -> None:
 @click.option(
     "--versions",
     required=True,
-    help="Comma-separated Python versions (e.g., 3.10,3.11,3.12,3.13,3.14)",
+    help=f"Comma-separated Python versions (e.g., {SUPPORTED_DOC_VERSIONS_CSV})",
 )
 @click.option(
     "--skip-content",
@@ -149,7 +153,8 @@ def build_index(versions: str, skip_content: bool) -> None:
     version_list = parse_expected_versions(versions)
     if not version_list:
         logger.error(
-            "No valid versions specified. Example: --versions 3.10,3.11,3.12,3.13,3.14"
+            "No valid versions specified. Example: --versions %s",
+            SUPPORTED_DOC_VERSIONS_CSV,
         )
         raise SystemExit(1)
 
@@ -390,8 +395,8 @@ def validate_corpus(db_path: str | None) -> None:
     if not target.exists():
         logger.error("Index not found at %s", target)
         logger.error(
-            "Run: mcp-server-python-docs build-index --versions "
-            "3.10,3.11,3.12,3.13,3.14"
+            "Run: mcp-server-python-docs build-index --versions %s",
+            SUPPORTED_DOC_VERSIONS_CSV,
         )
         raise SystemExit(1)
 
@@ -517,8 +522,8 @@ def doctor() -> None:
     index_detail = str(index_path)
     if not index_exists:
         index_detail += (
-            " (not found -- run: mcp-server-python-docs build-index --versions "
-            "3.10,3.11,3.12,3.13,3.14)"
+            f" (not found -- run: mcp-server-python-docs build-index --versions "
+            f"{SUPPORTED_DOC_VERSIONS_CSV})"
         )
     else:
         size_mb = index_path.stat().st_size / (1024 * 1024)

src/mcp_server_python_docs/ingestion/sphinx_json.py

@@ -183,7 +183,12 @@ def build_sphinx_json_command(
 
 
 def build_sphinx_bootstrap_requirements(sphinx_pin: str) -> list[str]:
-    """Return packages needed before installing CPython Doc requirements."""
+    """Return packages needed before installing CPython Doc requirements.
+
+    setuptools<70 keeps ``pkg_resources`` available, which old Sphinx
+    releases (e.g. the 3.4.x line pinned for the Python 3.10 docs build)
+    still import at startup.
+    """
     return [
         "setuptools<70",
         sphinx_pin,

src/mcp_server_python_docs/server.py

@@ -67,10 +67,14 @@ async def app_lifespan(server: FastMCP) -> AsyncIterator[AppContext]:
 
     # Fail fast on missing index (SRVR-10)
     if not index_path.exists():
+        from mcp_server_python_docs.ingestion.cpython_versions import (
+            SUPPORTED_DOC_VERSIONS_CSV,
+        )
+
         msg = (
             f"No index found at {index_path}\n"
-            "Run: mcp-server-python-docs build-index --versions "
-            "3.10,3.11,3.12,3.13,3.14"
+            f"Run: mcp-server-python-docs build-index --versions "
+            f"{SUPPORTED_DOC_VERSIONS_CSV}"
         )
         logger.error(msg)
         print(msg, file=sys.stderr)

tests/test_publish.py

@@ -15,6 +15,7 @@
 from mcp_server_python_docs.ingestion.cpython_versions import SUPPORTED_DOC_VERSIONS
 from mcp_server_python_docs.ingestion.publish import (
     SMOKE_SENTINEL_SYMBOL,
+    _version_sort_key,
     atomic_swap,
     compute_sha256,
     generate_build_path,
@@ -127,10 +128,7 @@ def _create_populated_db(
         bootstrap_schema(conn)
 
         doc_set_ids: dict[str, int] = {}
-        default_version = max(
-            versions,
-            key=lambda v: tuple(int(p) for p in v.split(".")),
-        )
+        default_version = max(versions, key=_version_sort_key)
 
         # Insert doc_sets
         for version in versions: