From ebf6629ecdfb83c8c6e8a1db03e5e2928cc6044b Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Wed, 7 Mar 2018 16:06:04 -0500 Subject: [PATCH 1/2] Resolve multiple extras when provided - Fixes #1094 --- HISTORY.txt | 1 + pipenv/utils.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/HISTORY.txt b/HISTORY.txt index 822ba0f9..839f92bb 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -1,3 +1,4 @@ + - Bugfix with resolving multiple extras 11.1.3: - Bugfix. 11.1.2: diff --git a/pipenv/utils.py b/pipenv/utils.py index c97494e8..3823f006 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -588,7 +588,7 @@ def convert_deps_to_pip(deps, project=None, r=True, include_index=False): # Support for extras (e.g. requests[socks]) if 'extras' in deps[dep]: - extra = '[{0}]'.format(deps[dep]['extras'][0]) + extra = '[{0}]'.format(','.join(deps[dep]['extras'])) if 'version' in deps[dep]: if not is_star(deps[dep]['version']): From 85e4b9ea2c534cbeace17f60f2c7fc4d9f2a2a13 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Thu, 8 Mar 2018 06:54:04 -0500 Subject: [PATCH 2/2] history Signed-off-by: Kenneth Reitz --- HISTORY.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HISTORY.txt b/HISTORY.txt index 839f92bb..b22abeba 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -1,4 +1,4 @@ - - Bugfix with resolving multiple extras + - Resolve multiple extras when provided. 11.1.3: - Bugfix. 11.1.2: