Merge pull request #11277 from vanschelven/respect-no-index-from-requirements-file

Author: uranusjr

news/11276.bugfix.rst

@@ -0,0 +1,2 @@
+Fix ``--no-index`` when ``--index-url`` or ``--extra-index-url`` is specified
+inside a requirements file.

src/pip/_internal/index/collector.py

@@ -552,6 +552,7 @@ def create(
         search_scope = SearchScope.create(
             find_links=find_links,
             index_urls=index_urls,
+            no_index=options.no_index,
         )
         link_collector = LinkCollector(
             session=session,

src/pip/_internal/models/search_scope.py

@@ -20,13 +20,14 @@ class SearchScope:
     Encapsulates the locations that pip is configured to search.
     """
 
-    __slots__ = ["find_links", "index_urls"]
+    __slots__ = ["find_links", "index_urls", "no_index"]
 
     @classmethod
     def create(
         cls,
         find_links: List[str],
         index_urls: List[str],
+        no_index: bool,
     ) -> "SearchScope":
         """
         Create a SearchScope object after normalizing the `find_links`.
@@ -60,15 +61,18 @@ def create(
         return cls(
             find_links=built_find_links,
             index_urls=index_urls,
+            no_index=no_index,
         )
 
     def __init__(
         self,
         find_links: List[str],
         index_urls: List[str],
+        no_index: bool,
     ) -> None:
         self.find_links = find_links
         self.index_urls = index_urls
+        self.no_index = no_index
 
     def get_formatted_locations(self) -> str:
         lines = []

src/pip/_internal/req/req_file.py

@@ -229,11 +229,13 @@ def handle_option_line(
     if finder:
         find_links = finder.find_links
         index_urls = finder.index_urls
-        if opts.index_url:
-            index_urls = [opts.index_url]
+        no_index = finder.search_scope.no_index
         if opts.no_index is True:
+            no_index = True
             index_urls = []
-        if opts.extra_index_urls:
+        if opts.index_url and not no_index:
+            index_urls = [opts.index_url]
+        if opts.extra_index_urls and not no_index:
             index_urls.extend(opts.extra_index_urls)
         if opts.find_links:
             # FIXME: it would be nice to keep track of the source
@@ -253,6 +255,7 @@ def handle_option_line(
         search_scope = SearchScope(
             find_links=find_links,
             index_urls=index_urls,
+            no_index=no_index,
         )
         finder.search_scope = search_scope
 

tests/functional/test_build_env.py

@@ -41,7 +41,7 @@ def run_with_build_env(
 
             link_collector = LinkCollector(
                 session=PipSession(),
-                search_scope=SearchScope.create([{scratch!r}], []),
+                search_scope=SearchScope.create([{scratch!r}], [], False),
             )
             selection_prefs = SelectionPreferences(
                 allow_yanked=True,

tests/lib/__init__.py

@@ -86,7 +86,11 @@ def make_test_search_scope(
     if index_urls is None:
         index_urls = []
 
-    return SearchScope.create(find_links=find_links, index_urls=index_urls)
+    return SearchScope.create(
+        find_links=find_links,
+        index_urls=index_urls,
+        no_index=False,
+    )
 
 
 def make_test_link_collector(

tests/unit/resolution_resolvelib/conftest.py

@@ -23,7 +23,7 @@
 @pytest.fixture
 def finder(data: TestData) -> Iterator[PackageFinder]:
     session = PipSession()
-    scope = SearchScope([str(data.packages)], [])
+    scope = SearchScope([str(data.packages)], [], False)
     collector = LinkCollector(session, scope)
     prefs = SelectionPreferences(allow_yanked=False)
     finder = PackageFinder.create(collector, prefs)

tests/unit/test_index.py

@@ -593,7 +593,7 @@ def test_create__candidate_prefs(
         """
         link_collector = LinkCollector(
             session=PipSession(),
-            search_scope=SearchScope([], []),
+            search_scope=SearchScope([], [], False),
         )
         selection_prefs = SelectionPreferences(
             allow_yanked=True,
@@ -614,7 +614,7 @@ def test_create__link_collector(self) -> None:
         """
         link_collector = LinkCollector(
             session=PipSession(),
-            search_scope=SearchScope([], []),
+            search_scope=SearchScope([], [], False),
         )
         finder = PackageFinder.create(
             link_collector=link_collector,
@@ -629,7 +629,7 @@ def test_create__target_python(self) -> None:
         """
         link_collector = LinkCollector(
             session=PipSession(),
-            search_scope=SearchScope([], []),
+            search_scope=SearchScope([], [], False),
         )
         target_python = TargetPython(py_version_info=(3, 7, 3))
         finder = PackageFinder.create(
@@ -649,7 +649,7 @@ def test_create__target_python_none(self) -> None:
         """
         link_collector = LinkCollector(
             session=PipSession(),
-            search_scope=SearchScope([], []),
+            search_scope=SearchScope([], [], False),
         )
         finder = PackageFinder.create(
             link_collector=link_collector,
@@ -668,7 +668,7 @@ def test_create__allow_yanked(self, allow_yanked: bool) -> None:
         """
         link_collector = LinkCollector(
             session=PipSession(),
-            search_scope=SearchScope([], []),
+            search_scope=SearchScope([], [], False),
         )
         selection_prefs = SelectionPreferences(allow_yanked=allow_yanked)
         finder = PackageFinder.create(
@@ -684,7 +684,7 @@ def test_create__ignore_requires_python(self, ignore_requires_python: bool) -> N
         """
         link_collector = LinkCollector(
             session=PipSession(),
-            search_scope=SearchScope([], []),
+            search_scope=SearchScope([], [], False),
         )
         selection_prefs = SelectionPreferences(
             allow_yanked=True,
@@ -702,7 +702,7 @@ def test_create__format_control(self) -> None:
         """
         link_collector = LinkCollector(
             session=PipSession(),
-            search_scope=SearchScope([], []),
+            search_scope=SearchScope([], [], False),
         )
         format_control = FormatControl(set(), {":all:"})
         selection_prefs = SelectionPreferences(
@@ -743,7 +743,7 @@ def test_make_link_evaluator(
 
         link_collector = LinkCollector(
             session=PipSession(),
-            search_scope=SearchScope([], []),
+            search_scope=SearchScope([], [], False),
         )
 
         finder = PackageFinder(
@@ -793,7 +793,7 @@ def test_make_candidate_evaluator(
         )
         link_collector = LinkCollector(
             session=PipSession(),
-            search_scope=SearchScope([], []),
+            search_scope=SearchScope([], [], False),
         )
         finder = PackageFinder(
             link_collector=link_collector,

tests/unit/test_req_file.py

@@ -395,6 +395,13 @@ def test_set_finder_no_index(
         line_processor("--no-index", "file", 1, finder=finder)
         assert finder.index_urls == []
 
+    def test_set_finder_no_index_is_remembered_for_later_invocations(
+        self, line_processor: LineProcessor, finder: PackageFinder
+    ) -> None:
+        line_processor("--no-index", "file", 1, finder=finder)
+        line_processor("--index-url=url", "file", 1, finder=finder)
+        assert finder.index_urls == []
+
     def test_set_finder_index_url(
         self, line_processor: LineProcessor, finder: PackageFinder, session: PipSession
     ) -> None:

tests/unit/test_search_scope.py

@@ -16,6 +16,7 @@ def test_get_formatted_locations_basic_auth(self) -> None:
         search_scope = SearchScope(
             find_links=find_links,
             index_urls=index_urls,
+            no_index=False,
         )
 
         result = search_scope.get_formatted_locations()
@@ -29,6 +30,7 @@ def test_get_index_urls_locations(self) -> None:
         search_scope = SearchScope(
             find_links=[],
             index_urls=["file://index1/", "file://index2"],
+            no_index=False,
         )
         req = install_req_from_line("Complex_Name")
         assert req.name is not None