Skip to content

Commit bc668e6

Browse files
authored
Merge pull request #5994 from mungojam/fix-keyring-warnings
* pass through pipfile index urls when creating https session so that keyring works * Add news entry
2 parents b75f496 + 023b6bc commit bc668e6

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

news/5994.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Pass through pipfile index urls when creating https session so that keyring fully works

pipenv/project.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ def get_requests_session_for_source(self, source):
243243
self.s.PIPENV_MAX_RETRIES,
244244
source.get("verify_ssl", True),
245245
cache_dir=self.s.PIPENV_CACHE_DIR,
246+
source=source.get("url"),
246247
)
247248
self.sessions[source["name"]] = session
248249
return session

pipenv/utils/internet.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@
88
from pipenv.patched.pip._vendor.urllib3 import util as urllib3_util
99

1010

11-
def get_requests_session(max_retries=1, verify_ssl=True, cache_dir=USER_CACHE_DIR):
11+
def get_requests_session(
12+
max_retries=1, verify_ssl=True, cache_dir=USER_CACHE_DIR, source=None
13+
):
1214
"""Load requests lazily."""
1315
pip_client_cert = os.environ.get("PIP_CLIENT_CERT")
14-
requests_session = PipSession(cache=cache_dir, retries=max_retries)
16+
index_urls = [source] if source else None
17+
requests_session = PipSession(
18+
cache=cache_dir, retries=max_retries, index_urls=index_urls
19+
)
1520
if pip_client_cert:
1621
requests_session.cert = pip_client_cert
1722
if verify_ssl is False:

0 commit comments

Comments
 (0)