Merge branch 'master' into master

This commit is contained in:
Dan Ryan
2019-05-26 23:34:39 -04:00
committed by GitHub
4 changed files with 14 additions and 2 deletions
-1
View File
@@ -18,7 +18,6 @@
/* Remain Responsive! */
@media screen and (max-width: 1008px) {
div.sphinxsidebar {display: none;}
div.document {width: 100%!important;}
/* Have code blocks escape the document right-margin. */
+1
View File
@@ -0,0 +1 @@
Ensure docs show navigation on small-screen devices
+1
View File
@@ -0,0 +1 @@
Improve the error message of ``pipenv --py`` when virtualenv can't be found.
+12 -1
View File
@@ -572,7 +572,7 @@ def ensure_project(
crayons.red("Warning", bold=True),
crayons.normal("python_version", bold=True),
crayons.blue(project.required_python_version),
crayons.blue(python_version(path_to_python)),
crayons.blue(python_version(path_to_python) or "unknown"),
crayons.green(shorten_path(path_to_python)),
),
err=True,
@@ -1775,6 +1775,17 @@ def ensure_lockfile(keep_outdated=False, pypi_mirror=None):
def do_py(system=False):
if not project.virtualenv_exists:
click.echo(
"{}({}){}".format(
crayons.red("No virtualenv has been created for this project "),
crayons.white(project.project_directory, bold=True),
crayons.red(" yet!")
),
err=True,
)
return
try:
click.echo(which("python", allow_global=system))
except AttributeError: