From f741059e2e3d7bbbde08d214bea1912dfd8f9a41 Mon Sep 17 00:00:00 2001 From: Matt Date: Fri, 11 May 2018 11:26:50 -0700 Subject: [PATCH 1/5] Make sure we are not in a virtualenv if aborting --- pipenv/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipenv/core.py b/pipenv/core.py index 4d1b559d..625ef784 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -1346,7 +1346,7 @@ def do_init( do_lock(system=system, pre=pre, keep_outdated=keep_outdated) # Write out the lockfile if it doesn't exist. if not project.lockfile_exists and not skip_lock: - if system or allow_global and not PIPENV_VIRTUALENV: + if (system or allow_global) and not PIPENV_VIRTUALENV: click.echo( '{0}: --system is intended to be used for Pipfile installation, ' 'not installation of specific packages. Aborting.'.format( From 9738b4224116ea1c2499d7a09b931ea2d768e855 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 12 May 2018 12:00:44 -0700 Subject: [PATCH 2/5] Add a comment describing the conditional --- pipenv/core.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pipenv/core.py b/pipenv/core.py index 625ef784..8c29cb2f 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -1346,6 +1346,8 @@ def do_init( do_lock(system=system, pre=pre, keep_outdated=keep_outdated) # Write out the lockfile if it doesn't exist. if not project.lockfile_exists and not skip_lock: + # Unless we're in a virtualenv not managed by pipenv, abort if we're + # using the system's python. if (system or allow_global) and not PIPENV_VIRTUALENV: click.echo( '{0}: --system is intended to be used for Pipfile installation, ' From fb5c4be763edc998af1a996a5c50ec3b95082b93 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Mon, 14 May 2018 00:57:38 +0800 Subject: [PATCH 3/5] Echo Pipfile location during init This should help the user know what's going on in situations like #2185. Because I'm not very bright --- pipenv/core.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pipenv/core.py b/pipenv/core.py index 4d1b559d..95377c73 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -884,6 +884,9 @@ def do_create_virtualenv(python=None, site_packages=False): crayons.normal(u'Creating a virtualenv for this project…', bold=True), err=True, ) + click.echo(u'Pipfile: {0}'.format( + crayons.red(project.pipfile_location, bold=True), + ), err=True) # The user wants the virtualenv in the project. if project.is_venv_in_project(): cmd = [ From 71bf8e51300abe5c57117cc47fba1807cd4465fa Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Tue, 15 May 2018 09:25:31 -0700 Subject: [PATCH 4/5] Update the wording to clarify Pipenv's overall role in the packaging ecosystem --- README.rst | 2 +- docs/index.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index cb80c8b6..48e46cbd 100644 --- a/README.rst +++ b/README.rst @@ -18,7 +18,7 @@ Pipenv: Python Development Workflow for Humans --------------- -**Pipenv** — the officially recommended Python packaging tool from `Python.org `_, free (as in freedom). +**Pipenv** — the officially recommended tool for managing application dependencies from `Python.org `_, free (as in freedom). Pipenv is a tool that aims to bring the best of all packaging worlds (bundler, composer, npm, cargo, yarn, etc.) to the Python world. *Windows is a first–class citizen, in our world.* diff --git a/docs/index.rst b/docs/index.rst index 06d59eda..712e3f7d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -20,7 +20,7 @@ Pipenv: Python Dev Workflow for Humans --------------- -**Pipenv** — the officially recommended Python packaging tool from `Python.org `_, free (as in freedom). +**Pipenv** — the officially recommended tool for managing application dependencies from `Python.org `_, free (as in freedom). Pipenv is a tool that aims to bring the best of all packaging worlds (bundler, composer, npm, cargo, yarn, etc.) to the Python world. *Windows is a first-class citizen, in our world.* From 9ba232429822d7de931289c151e7e9df11489dd4 Mon Sep 17 00:00:00 2001 From: Jon Wayne Parrott Date: Tue, 15 May 2018 11:08:45 -0700 Subject: [PATCH 5/5] Update the wording a little --- README.rst | 2 +- docs/index.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 48e46cbd..912808a2 100644 --- a/README.rst +++ b/README.rst @@ -18,7 +18,7 @@ Pipenv: Python Development Workflow for Humans --------------- -**Pipenv** — the officially recommended tool for managing application dependencies from `Python.org `_, free (as in freedom). +**Pipenv** — the recommended tool for managing application dependencies from `packaging.python.org `__, free (as in freedom). Pipenv is a tool that aims to bring the best of all packaging worlds (bundler, composer, npm, cargo, yarn, etc.) to the Python world. *Windows is a first–class citizen, in our world.* diff --git a/docs/index.rst b/docs/index.rst index 712e3f7d..1c122faa 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -20,7 +20,7 @@ Pipenv: Python Dev Workflow for Humans --------------- -**Pipenv** — the officially recommended tool for managing application dependencies from `Python.org `_, free (as in freedom). +**Pipenv** — the recommended tool for managing application dependencies from `packaging.python.org `__, free (as in freedom). Pipenv is a tool that aims to bring the best of all packaging worlds (bundler, composer, npm, cargo, yarn, etc.) to the Python world. *Windows is a first-class citizen, in our world.*