Skip to content

install: Update extra-index-url in session from requirements file #8522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions news/8103.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Propagate ``--extra-index-url`` from requirements file properly to session auth,
so that keyring auth will work as expected.
8 changes: 8 additions & 0 deletions src/pip/_internal/network/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,14 @@ def __init__(self, *args, **kwargs):
for host in trusted_hosts:
self.add_trusted_host(host, suppress_logging=True)

def update_index_urls(self, new_index_urls):
# type: (List[str]) -> None
"""
:param new_index_urls: New index urls to update the authentication
handler with.
"""
self.auth.index_urls = new_index_urls

def add_trusted_host(self, host, source=None, suppress_logging=False):
# type: (str, Optional[str], bool) -> None
"""
Expand Down
4 changes: 4 additions & 0 deletions src/pip/_internal/req/req_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,10 @@ def handle_option_line(
value = relative_to_reqs_file
find_links.append(value)

if session:
# We need to update the auth urls in session
session.update_index_urls(index_urls)

search_scope = SearchScope(
find_links=find_links,
index_urls=index_urls,
Expand Down
13 changes: 9 additions & 4 deletions tests/unit/test_req_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,17 +341,22 @@ def test_set_finder_no_index(self, line_processor, finder):
line_processor("--no-index", "file", 1, finder=finder)
assert finder.index_urls == []

def test_set_finder_index_url(self, line_processor, finder):
line_processor("--index-url=url", "file", 1, finder=finder)
def test_set_finder_index_url(self, line_processor, finder, session):
line_processor(
"--index-url=url", "file", 1, finder=finder, session=session)
assert finder.index_urls == ['url']
assert session.auth.index_urls == ['url']

def test_set_finder_find_links(self, line_processor, finder):
line_processor("--find-links=url", "file", 1, finder=finder)
assert finder.find_links == ['url']

def test_set_finder_extra_index_urls(self, line_processor, finder):
line_processor("--extra-index-url=url", "file", 1, finder=finder)
def test_set_finder_extra_index_urls(
self, line_processor, finder, session):
line_processor(
"--extra-index-url=url", "file", 1, finder=finder, session=session)
assert finder.index_urls == ['url']
assert session.auth.index_urls == ['url']

def test_set_finder_trusted_host(
self, line_processor, caplog, session, finder
Expand Down