kennethreitz/pipenv
1
0
Fork 0
mirror of https://github.com/kennethreitz/pipenv.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a nasty bug

Browse Source 
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
This commit is contained in:
Kenneth Reitz
2017-09-22 18:01:11 -04:00
parent 403e74b8c3
commit 7d2927f3ce
2 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pipenv/cli.py
+5 -4
View File
@@ -710,11 +710,11 @@ def do_install_dependencies(
procs = []
deps_list = progress.bar(deps_list, label=INSTALL_LABEL if os.name != 'nt' else '')
deps_list_bar = progress.bar(deps_list, label=INSTALL_LABEL if os.name != 'nt' else '')
for dep, ignore_hash in deps_list:
for dep, ignore_hash in deps_list_bar:
if len(procs) < PIPENV_MAX_SUBPROCESS:
if len(procs) < PIPENV_MAX_SUBPROCESS or (not len(procs) == len(deps_list - 1)):
# Use a specific index, if specified.
index = None
if ' -i ' in dep:
@@ -735,7 +735,8 @@ def do_install_dependencies(
c.dep = dep
procs.append(c)
else:
if len(procs) >= PIPENV_MAX_SUBPROCESS or len(procs) == len(deps_list):
for c in procs:
if concurrent:
pipenv/utils.py
+20 -24
View File
@@ -412,7 +412,6 @@ def resolve_deps(deps, which, which_pip, project, sources=None, verbose=False, p
name = 'PipCommand'
constraints = []
pinned_constraints = []
extra_constraints = []
for dep in deps:
@@ -438,12 +437,9 @@ def resolve_deps(deps, which, which_pip, project, sources=None, verbose=False, p
# if 'python_version' in dep:
# python_version_lookup[constraint.name] = dep.split(';')[1].strip().split('python_version ')[1]
if '==' not in dep:
constraints.append(constraint)
constraints.extend(extra_constraints)
else:
pinned_constraints.append(constraint)
pinned_constraints.extend(extra_constraints)
constraints.append(constraint)
constraints.extend(extra_constraints)
pip_command = get_pip_command()
@@ -464,23 +460,23 @@ def resolve_deps(deps, which, which_pip, project, sources=None, verbose=False, p
results = []
resolved_tree = set()
for constraint_set in (constraints, pinned_constraints):
resolver = Resolver(constraints=constraint_set, repository=pypi, clear_caches=clear, allow_unsafe=True)
# pre-resolve instead of iterating to avoid asking pypi for hashes of editable packages
try:
resolved_tree.update(resolver.resolve())
except (NoCandidateFound, DistributionNotFound) as e:
click.echo(
'{0}: Your dependencies could not be resolved. You likely have a mismatch in your sub-dependencies.\n '
'You can use {1} to bypass this mechanism, then run {2} to inspect the situation.'
''.format(
crayons.red('Warning', bold=True),
crayons.red('$ pipenv install --skip-lock'),
crayons.red('$ pipenv graph')
),
err=True)
click.echo(crayons.blue(e))
sys.exit(1)
resolver = Resolver(constraints=constraints, repository=pypi, clear_caches=clear, allow_unsafe=True)
# pre-resolve instead of iterating to avoid asking pypi for hashes of editable packages
try:
resolved_tree.update(resolver.resolve())
except (NoCandidateFound, DistributionNotFound) as e:
click.echo(
'{0}: Your dependencies could not be resolved. You likely have a mismatch in your sub-dependencies.\n '
'You can use {1} to bypass this mechanism, then run {2} to inspect the situation.'
''.format(
crayons.red('Warning', bold=True),
crayons.red('$ pipenv install --skip-lock'),
crayons.red('$ pipenv graph')
),
err=True)
click.echo(crayons.blue(e))
sys.exit(1)
for result in resolved_tree:
if not result.editable: