Merge branch 'master' into continue-fix-3188

pypa · Nov 12, 2018 · c270562 · c270562
2 parents a067a08 + b96cd81
commit c270562
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 254 deletions.
diff --git a/.vsts-ci/docs.yml b/.vsts-ci/docs.yml
diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
diff --git a/.vsts-ci/phases/run-manifest-check.yml b/.vsts-ci/phases/run-manifest-check.yml
diff --git a/.vsts-ci/phases/run-tests-windows.yml b/.vsts-ci/phases/run-tests-windows.yml
diff --git a/.vsts-ci/phases/run-tests.yml b/.vsts-ci/phases/run-tests.yml
diff --git a/.vsts-ci/phases/run-vendor-scripts.yml b/.vsts-ci/phases/run-vendor-scripts.yml
diff --git a/.vsts-ci/phases/test.yml b/.vsts-ci/phases/test.yml
diff --git a/.vsts-ci/steps/create-virtualenv.yml b/.vsts-ci/steps/create-virtualenv.yml
diff --git a/.vsts-ci/steps/install-dependencies.yml b/.vsts-ci/steps/install-dependencies.yml
diff --git a/.vsts-ci/steps/run-tests.yml b/.vsts-ci/steps/run-tests.yml
diff --git a/.vsts-ci/windows.yml b/.vsts-ci/windows.yml
diff --git a/news/3199.trivial b/news/3199.trivial
@@ -0,0 +1 @@
+Remove blank lines for pipenv graph
diff --git a/news/3201.bugfix b/news/3201.bugfix
@@ -0,0 +1 @@
+Fix a bug where exception is raised when run pipenv graph in a project without created virtualenv
diff --git a/pipenv/core.py b/pipenv/core.py
@@ -2438,6 +2438,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(
@@ -2517,7 +2520,7 @@ def traverse(obj):
             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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix a bug where exception is raised when run pipenv graph in a project without created virtualenv