refactor: rename RequirementResolver to BootstrapRequirementResolver

Rename class and files to better reflect purpose:
- RequirementResolver → BootstrapRequirementResolver
- requirement_resolver.py → bootstrap_requirement_resolver.py
- test_requirement_resolver.py → test_bootstrap_requirement_resolver.py

The new name clarifies that this resolver is specifically for the
bootstrap process, reducing naming confusion.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Signed-off-by: Rohan Devasthale <rdevasth@redhat.com>

Author: rd4398

src/fromager/requirement_resolver.py …omager/bootstrap_requirement_resolver.pysrc/fromager/requirement_resolver.py renamed to src/fromager/bootstrap_requirement_resolver.py src/fromager/requirement_resolver.py renamed to src/fromager/bootstrap_requirement_resolver.py

@@ -22,10 +22,10 @@
 logger = logging.getLogger(__name__)
 
 
-class RequirementResolver:
-    """Resolve package requirements from PyPI or dependency graph.
+class BootstrapRequirementResolver:
+    """Resolve package requirements from PyPI or dependency graph during bootstrap.
 
-    Single Responsibility: Coordinate resolution strategies.
+    Single Responsibility: Coordinate resolution strategies for bootstrap process.
     Reason to Change: Resolution algorithm or provider priorities change.
 
     Resolution strategies (in order):

src/fromager/bootstrapper.py

@@ -19,12 +19,12 @@
 from packaging.version import Version
 
 from . import (
+    bootstrap_requirement_resolver,
     build_environment,
     dependencies,
     finders,
     hooks,
     progress,
-    requirement_resolver,
     resolver,
     server,
     sources,
@@ -103,8 +103,8 @@ def __init__(
         self.test_mode = test_mode
         self.why: list[tuple[RequirementType, Requirement, Version]] = []
 
-        # Delegate resolution to RequirementResolver
-        self._resolver = requirement_resolver.RequirementResolver(
+        # Delegate resolution to BootstrapRequirementResolver
+        self._resolver = bootstrap_requirement_resolver.BootstrapRequirementResolver(
             ctx=ctx,
             prev_graph=prev_graph,
         )
@@ -180,7 +180,7 @@ def resolve_version(
 
         Git URL resolution stays in Bootstrapper because it requires
         build orchestration (BuildEnvironment, build dependencies).
-        Delegates PyPI/graph resolution to RequirementResolver.
+        Delegates PyPI/graph resolution to BootstrapRequirementResolver.
         """
         if req.url:
             if req_type != RequirementType.TOP_LEVEL:

tests/test_requirement_resolver.py …s/test_bootstrap_requirement_resolver.pytests/test_requirement_resolver.py renamed to tests/test_bootstrap_requirement_resolver.py tests/test_requirement_resolver.py renamed to tests/test_bootstrap_requirement_resolver.py

@@ -1,4 +1,4 @@
-"""Tests for requirement_resolver module."""
+"""Tests for bootstrap_requirement_resolver module."""
 
 from unittest.mock import MagicMock, patch
 
@@ -7,9 +7,9 @@
 from packaging.utils import canonicalize_name
 from packaging.version import Version
 
+from fromager.bootstrap_requirement_resolver import BootstrapRequirementResolver
 from fromager.context import WorkContext
 from fromager.dependency_graph import DependencyGraph
-from fromager.requirement_resolver import RequirementResolver
 from fromager.requirements_file import RequirementType
 
 # Test fixture: previous dependency graph
@@ -65,8 +65,8 @@
 
 
 def test_resolve_from_graph_no_changes(tmp_context: WorkContext) -> None:
-    """RequirementResolver resolves from previous graph with no changes."""
-    resolver = RequirementResolver(tmp_context, old_graph)
+    """BootstrapRequirementResolver resolves from previous graph with no changes."""
+    resolver = BootstrapRequirementResolver(tmp_context, old_graph)
 
     # Resolving new dependency that doesn't exist in graph
     assert (
@@ -105,8 +105,8 @@ def test_resolve_from_graph_no_changes(tmp_context: WorkContext) -> None:
 
 
 def test_resolve_from_graph_install_dep_upgrade(tmp_context: WorkContext) -> None:
-    """RequirementResolver prefers top-level requirements over history."""
-    resolver = RequirementResolver(tmp_context, old_graph)
+    """BootstrapRequirementResolver prefers top-level requirements over history."""
+    resolver = BootstrapRequirementResolver(tmp_context, old_graph)
 
     # Simulating new bootstrap with a toplevel requirement of pbr==8
     tmp_context.dependency_graph.add_dependency(
@@ -143,8 +143,8 @@ def test_resolve_from_graph_install_dep_upgrade(tmp_context: WorkContext) -> Non
 
 
 def test_resolve_from_graph_install_dep_downgrade(tmp_context: WorkContext) -> None:
-    """RequirementResolver handles version downgrades from top-level requirements."""
-    resolver = RequirementResolver(tmp_context, old_graph)
+    """BootstrapRequirementResolver handles version downgrades from top-level requirements."""
+    resolver = BootstrapRequirementResolver(tmp_context, old_graph)
 
     # Simulating new bootstrap with a toplevel requirement of pbr<=6
     tmp_context.dependency_graph.add_dependency(
@@ -181,8 +181,8 @@ def test_resolve_from_graph_install_dep_downgrade(tmp_context: WorkContext) -> N
 
 
 def test_resolve_from_graph_toplevel_dep(tmp_context: WorkContext) -> None:
-    """RequirementResolver resolves top-level dependencies correctly."""
-    resolver = RequirementResolver(tmp_context, old_graph)
+    """BootstrapRequirementResolver resolves top-level dependencies correctly."""
+    resolver = BootstrapRequirementResolver(tmp_context, old_graph)
 
     # Simulating new bootstrap with a toplevel requirement for foo
     tmp_context.dependency_graph.add_dependency(
@@ -236,8 +236,8 @@ def test_resolve_from_graph_toplevel_dep(tmp_context: WorkContext) -> None:
 
 
 def test_resolve_from_graph_no_previous_graph(tmp_context: WorkContext) -> None:
-    """RequirementResolver returns None when no previous graph is available."""
-    resolver = RequirementResolver(tmp_context, prev_graph=None)
+    """BootstrapRequirementResolver returns None when no previous graph is available."""
+    resolver = BootstrapRequirementResolver(tmp_context, prev_graph=None)
 
     assert (
         resolver._resolve_from_graph(
@@ -278,7 +278,7 @@ def test_resolve_from_graph_new_parent_reuses_existing_version(
         req_version=Version("25.0"),
     )
 
-    resolver = RequirementResolver(tmp_context, prev_graph)
+    resolver = BootstrapRequirementResolver(tmp_context, prev_graph)
 
     # Resolve packaging>=24.0 via a NEW parent "wheel" that is NOT in prev_graph.
     # packaging==25.0 satisfies >=24.0 and exists in the graph, so it should
@@ -322,7 +322,7 @@ def test_resolve_from_graph_different_req_type_reuses_existing_version(
         req_version=Version("2.0"),
     )
 
-    resolver = RequirementResolver(tmp_context, prev_graph)
+    resolver = BootstrapRequirementResolver(tmp_context, prev_graph)
 
     # Now resolve bar>=1.5 as an INSTALL dep of foo (different req_type).
     # bar==2.0 satisfies >=1.5 and exists in the graph under the same parent
@@ -381,7 +381,7 @@ def test_resolve_from_graph_parent_specific_preferred_over_name_fallback(
         req_version=Version("3.0"),
     )
 
-    resolver = RequirementResolver(tmp_context, prev_graph)
+    resolver = BootstrapRequirementResolver(tmp_context, prev_graph)
 
     # Resolve bar>=1.0 as install dep of foo.  The parent-specific lookup
     # should return bar==2.0 (from foo), NOT bar==3.0 (from baz via fallback).
@@ -422,7 +422,7 @@ def test_resolve_from_graph_name_fallback_returns_none_for_missing_package(
         req_version=Version("2.0"),
     )
 
-    resolver = RequirementResolver(tmp_context, prev_graph)
+    resolver = BootstrapRequirementResolver(tmp_context, prev_graph)
 
     result = resolver._resolve_from_graph(
         req=Requirement("missing-pkg>=1.0"),
@@ -434,8 +434,8 @@ def test_resolve_from_graph_name_fallback_returns_none_for_missing_package(
 
 
 def test_resolve_rejects_git_urls_for_source(tmp_context: WorkContext) -> None:
-    """RequirementResolver.resolve() rejects git URLs when pre_built=False."""
-    resolver = RequirementResolver(tmp_context)
+    """BootstrapRequirementResolver.resolve() rejects git URLs when pre_built=False."""
+    resolver = BootstrapRequirementResolver(tmp_context)
 
     with pytest.raises(
         ValueError, match="Git URL requirements must be handled by Bootstrapper"
@@ -448,20 +448,17 @@ def test_resolve_rejects_git_urls_for_source(tmp_context: WorkContext) -> None:
         )
 
 
-@patch("fromager.requirement_resolver.wheels.resolve_prebuilt_wheel_all")
-@patch("fromager.requirement_resolver.wheels.get_wheel_server_urls")
+@patch("fromager.resolver.resolve_from_provider")
 def test_resolve_allows_git_urls_for_prebuilt(
-    mock_get_servers: MagicMock,
-    mock_resolve_wheel: MagicMock,
+    mock_resolve: MagicMock,
     tmp_context: WorkContext,
 ) -> None:
-    """RequirementResolver.resolve() allows git URLs when pre_built=True (test mode fallback)."""
-    resolver = RequirementResolver(tmp_context)
+    """BootstrapRequirementResolver.resolve() allows git URLs when pre_built=True (test mode fallback)."""
+    resolver = BootstrapRequirementResolver(tmp_context)
     req = Requirement("mypkg @ git+https://github.com/example/repo.git")
 
-    # Mock wheel resolution to return expected result (as list)
-    mock_get_servers.return_value = ["https://pypi.org/simple"]
-    mock_resolve_wheel.return_value = [
+    # Mock resolution to return expected result (as list)
+    mock_resolve.return_value = [
         ("https://files.pythonhosted.org/mypkg-1.0-py3-none-any.whl", Version("1.0"))
     ]
 
@@ -473,32 +470,30 @@ def test_resolve_allows_git_urls_for_prebuilt(
         parent_req=None,
     )
 
-    # Verify it routed to wheel resolution
-    mock_resolve_wheel.assert_called_once()
+    # Verify resolution was called
+    mock_resolve.assert_called_once()
     assert url == "https://files.pythonhosted.org/mypkg-1.0-py3-none-any.whl"
     assert version == Version("1.0")
 
 
-@patch("fromager.requirement_resolver.wheels.resolve_prebuilt_wheel_all")
-@patch("fromager.requirement_resolver.wheels.get_wheel_server_urls")
+@patch("fromager.resolver.resolve_from_provider")
 def test_resolve_auto_routes_to_prebuilt(
-    mock_get_servers: MagicMock,
-    mock_resolve_wheel: MagicMock,
+    mock_resolve: MagicMock,
     tmp_context: WorkContext,
 ) -> None:
-    """resolve(pre_built=None) with pbi.pre_built=True routes to wheels.resolve_prebuilt_wheel_all."""
+    """resolve(pre_built=None) with pbi.pre_built=True routes to wheel resolution."""
     req = Requirement("setuptools>=40")
 
     # Mock package build info to return pre_built=True
     mock_pbi = MagicMock()
     mock_pbi.pre_built = True
+    mock_pbi.wheel_server_url = None
 
     with patch.object(tmp_context, "package_build_info", return_value=mock_pbi):
-        resolver = RequirementResolver(tmp_context)
+        resolver = BootstrapRequirementResolver(tmp_context)
 
-        # Mock wheel resolution to return expected result (as list)
-        mock_get_servers.return_value = ["https://pypi.org/simple"]
-        mock_resolve_wheel.return_value = [
+        # Mock resolution to return expected result (as list)
+        mock_resolve.return_value = [
             (
                 "https://files.pythonhosted.org/setuptools-1.0-py3-none-any.whl",
                 Version("1.0"),
@@ -513,29 +508,35 @@ def test_resolve_auto_routes_to_prebuilt(
             pre_built=None,
         )
 
-        # Verify it routed to wheel resolution
-        mock_resolve_wheel.assert_called_once()
+        # Verify resolution was called
+        mock_resolve.assert_called_once()
         assert url == "https://files.pythonhosted.org/setuptools-1.0-py3-none-any.whl"
         assert version == Version("1.0")
 
 
-@patch("fromager.requirement_resolver.sources.resolve_source_all")
+@patch("fromager.resolver.resolve_from_provider")
 def test_resolve_auto_routes_to_source(
-    mock_resolve_source: MagicMock,
+    mock_resolve: MagicMock,
     tmp_context: WorkContext,
 ) -> None:
-    """resolve(pre_built=None) with pbi.pre_built=False routes to sources.resolve_source_all."""
+    """resolve(pre_built=None) with pbi.pre_built=False routes to source resolution."""
     req = Requirement("mypackage>=1.0")
 
     # Mock package build info to return pre_built=False
     mock_pbi = MagicMock()
     mock_pbi.pre_built = False
+    mock_pbi.resolver_include_sdists = True
+    mock_pbi.resolver_include_wheels = True
+    mock_pbi.resolver_ignore_platform = True
+    mock_pbi.resolver_sdist_server_url = MagicMock(
+        return_value="https://pypi.org/simple"
+    )
 
     with patch.object(tmp_context, "package_build_info", return_value=mock_pbi):
-        resolver = RequirementResolver(tmp_context)
+        resolver = BootstrapRequirementResolver(tmp_context)
 
         # Mock source resolution to return expected result (as list)
-        mock_resolve_source.return_value = [
+        mock_resolve.return_value = [
             ("https://files.pythonhosted.org/mypackage-2.0.tar.gz", Version("2.0"))
         ]
 
@@ -547,70 +548,57 @@ def test_resolve_auto_routes_to_source(
             pre_built=None,
         )
 
-        # Verify it routed to source resolution
-        mock_resolve_source.assert_called_once()
+        # Verify resolution was called
+        mock_resolve.assert_called_once()
         assert url == "https://files.pythonhosted.org/mypackage-2.0.tar.gz"
         assert version == Version("2.0")
 
 
-@patch("fromager.requirement_resolver.wheels.resolve_prebuilt_wheel_all")
-@patch("fromager.requirement_resolver.wheels.get_wheel_server_urls")
-@patch("fromager.requirement_resolver.sources.resolve_source_all")
+@patch("fromager.resolver.resolve_from_provider")
 def test_resolve_prebuilt_after_source_uses_separate_cache(
-    mock_resolve_source: MagicMock,
-    mock_get_servers: MagicMock,
-    mock_resolve_wheel: MagicMock,
+    mock_resolve: MagicMock,
     tmp_context: WorkContext,
 ) -> None:
     """resolve(pre_built=True) after same req resolved as source uses separate cache."""
     req = Requirement("testpkg==1.5")
 
-    # Mock package build info to return pre_built=False initially
-    mock_pbi = MagicMock()
-    mock_pbi.pre_built = False
-
-    with patch.object(tmp_context, "package_build_info", return_value=mock_pbi):
-        resolver = RequirementResolver(tmp_context)
-
-        # Mock source resolution (as list)
-        mock_resolve_source.return_value = [
-            ("https://files.pythonhosted.org/testpkg-1.5.tar.gz", Version("1.5"))
-        ]
-
-        # First call: resolve as source (pre_built=None, auto-detects to False)
-        url1, version1 = resolver.resolve(
-            req=req,
-            req_type=RequirementType.INSTALL,
-            parent_req=None,
-            pre_built=None,
-        )
-
-        assert url1 == "https://files.pythonhosted.org/testpkg-1.5.tar.gz"
-        assert version1 == Version("1.5")
-        assert mock_resolve_source.call_count == 1
-
-        # Mock wheel resolution for second call (as list)
-        mock_get_servers.return_value = ["https://pypi.org/simple"]
-        mock_resolve_wheel.return_value = [
+    # Set up side_effect to return different results for each call
+    mock_resolve.side_effect = [
+        # First call: source resolution
+        [("https://files.pythonhosted.org/testpkg-1.5.tar.gz", Version("1.5"))],
+        # Second call: wheel resolution
+        [
             (
                 "https://files.pythonhosted.org/testpkg-1.5-py3-none-any.whl",
                 Version("1.5"),
             )
-        ]
+        ],
+    ]
 
-        # Second call: resolve same req as prebuilt (explicit pre_built=True)
-        # This should NOT return the cached source result
-        url2, version2 = resolver.resolve(
-            req=req,
-            req_type=RequirementType.INSTALL,
-            parent_req=None,
-            pre_built=True,
-        )
+    resolver = BootstrapRequirementResolver(tmp_context)
+
+    # First call: resolve as source (explicit pre_built=False)
+    url1, version1 = resolver.resolve(
+        req=req,
+        req_type=RequirementType.INSTALL,
+        parent_req=None,
+        pre_built=False,
+    )
 
-        # Verify it called wheel resolution (not cached)
-        assert mock_resolve_wheel.call_count == 1
-        assert url2 == "https://files.pythonhosted.org/testpkg-1.5-py3-none-any.whl"
-        assert version2 == Version("1.5")
+    assert url1 == "https://files.pythonhosted.org/testpkg-1.5.tar.gz"
+    assert version1 == Version("1.5")
+    assert mock_resolve.call_count == 1
+
+    # Second call: resolve same req as prebuilt (explicit pre_built=True)
+    # This should NOT return the cached source result
+    url2, version2 = resolver.resolve(
+        req=req,
+        req_type=RequirementType.INSTALL,
+        parent_req=None,
+        pre_built=True,
+    )
 
-        # Verify source was only called once (first time, not second)
-        assert mock_resolve_source.call_count == 1
+    # Verify it called resolution again (not cached) because cache keys differ
+    assert mock_resolve.call_count == 2
+    assert url2 == "https://files.pythonhosted.org/testpkg-1.5-py3-none-any.whl"
+    assert version2 == Version("1.5")