mirror of
https://github.com/kennethreitz/pipenv.git
synced 2026-06-05 22:50:18 +00:00
Merge branch 'master' into update-vendor
This commit is contained in:
@@ -0,0 +1 @@
|
||||
Remove blank lines for pipenv graph
|
||||
@@ -0,0 +1 @@
|
||||
Fix a bug where exception is raised when run pipenv graph in a project without created virtualenv
|
||||
+5
-2
@@ -721,7 +721,7 @@ def do_install_dependencies(
|
||||
# Allow pip to resolve dependencies when in skip-lock mode.
|
||||
no_deps = not skip_lock
|
||||
failed_deps_list = []
|
||||
deps_list = list(lockfile.get_requirements(dev=dev, only=True))
|
||||
deps_list = list(lockfile.get_requirements(dev=dev, only=requirements))
|
||||
if requirements:
|
||||
index_args = prepare_pip_source_args(project.sources)
|
||||
index_args = " ".join(index_args).replace(" -", "\n-")
|
||||
@@ -2448,6 +2448,9 @@ def do_graph(bare=False, json=False, json_tree=False, reverse=False):
|
||||
err=True,
|
||||
)
|
||||
sys.exit(1)
|
||||
except RuntimeError:
|
||||
pass
|
||||
|
||||
if reverse and json:
|
||||
click.echo(
|
||||
u"{0}: {1}".format(
|
||||
@@ -2527,7 +2530,7 @@ def do_graph(bare=False, json=False, json_tree=False, reverse=False):
|
||||
click.echo(simplejson.dumps(data, indent=4))
|
||||
sys.exit(0)
|
||||
else:
|
||||
for line in c.out.split("\n"):
|
||||
for line in c.out.strip().split("\n"):
|
||||
# Ignore bad packages as top level.
|
||||
if line.split("==")[0] in BAD_PACKAGES and not reverse:
|
||||
continue
|
||||
|
||||
Reference in New Issue
Block a user