Merge pull request #2521 from pypa/purge-pew

Un-vendor Pew
pypa · Jul 5, 2018 · ef6e667 · ef6e667
2 parents f5a1fa7 + 06fda49
commit ef6e667
Show file tree

Hide file tree

Showing 40 changed files with 22 additions and 2,040 deletions.
diff --git a/docs/advanced.rst b/docs/advanced.rst
@@ -382,7 +382,7 @@ will detect it.
     - ``PIPENV_SHELL_FANCY`` — Always use fancy mode when invoking ``pipenv shell``.
 
     - ``PIPENV_VENV_IN_PROJECT`` — If set, use ``.venv`` in your project directory
-      instead of the global virtualenv manager ``pew``.
+      instead of a global location.
 
     - ``PIPENV_COLORBLIND`` — Disable terminal colors, for some reason.
 
@@ -424,8 +424,9 @@ For example::
 ☤ Custom Virtual Environment Location
 -------------------------------------
 
-Pipenv's underlying ``pew`` dependency will automatically honor the ``WORKON_HOME`` environment
-variable, if you have it set — so you can tell pipenv to store your virtual environments wherever you want, e.g.::
+Pipenv automatically honors the ``WORKON_HOME`` environment variable, if you
+have it set — so you can tell pipenv to store your virtual environments
+wherever you want, e.g.::
 
     export WORKON_HOME=~/.venvs
 

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -10,7 +10,6 @@ imagesize==0.7.1
 Jinja2==2.9.6
 MarkupSafe==1.0
 pbr==3.1.1
-pew==0.1.26
 pip-tools==1.9.0
 -e .
 Pygments==2.2.0

diff --git a/news/2503.behavior b/news/2503.behavior
@@ -0,0 +1,2 @@
+Virtual environment activation for ``run`` is revised to improve interpolation
+with other Python discovery tools.
diff --git a/news/2511.behavior b/news/2511.behavior
@@ -0,0 +1 @@
+Improve terminal coloring to display better in Powershell.
diff --git a/news/2515.bugfix b/news/2515.bugfix
@@ -0,0 +1 @@
+Fix subshell invocation on Windows for Python 2.
diff --git a/news/2518.behavior b/news/2518.behavior
@@ -0,0 +1 @@
+Invoke ``virtualenv`` directly for virtual environment creation, instead of depending on ``pew``.
diff --git a/news/2521.vendor b/news/2521.vendor
@@ -0,0 +1,2 @@
+Pew is no longer vendored. Entry point ``pewtwo``, packages ``pipenv.pew`` and
+``pipenv.patched.pew`` are removed.
diff --git a/pipenv/core.py b/pipenv/core.py
@@ -454,7 +454,7 @@ def activate_pyenv():
             if (not PIPENV_DONT_USE_PYENV) and (SESSION_IS_INTERACTIVE or PIPENV_YES):
                 version_map = {
                     # TODO: Keep this up to date!
-                    # These versions appear incompatible with pew:
+                    # These versions appear incompatible with virtualenv:
                     # '2.5': '2.5.6',
                     "2.6": "2.6.9",
                     "2.7": "2.7.15",

diff --git a/pipenv/environments.py b/pipenv/environments.py
@@ -11,7 +11,7 @@
 PIPENV_SHELL_FANCY = bool(os.environ.get("PIPENV_SHELL_FANCY"))
 # Support for both Python 2 and Python 3 at the same time.
 PIPENV_PYTHON = os.environ.get("PIPENV_PYTHON")
-# Create the virtualenv in the project, instead of with pew.
+# Create the virtualenv in the project, instead of in WORKON_HOME.
 PIPENV_VENV_IN_PROJECT = bool(os.environ.get("PIPENV_VENV_IN_PROJECT"))
 # Overwrite all index funcitonality.
 PIPENV_TEST_INDEX = os.environ.get("PIPENV_TEST_INDEX")

diff --git a/pipenv/patched/patched.txt b/pipenv/patched/patched.txt
@@ -1,7 +1,6 @@
 safety
 git+https://github.com/jumpscale7/python-consistent-toml.git#egg=contoml
 crayons==0.1.2
-git+https://github.com/berdario/[email protected]#egg=pew
 pipfile==0.0.2
 git+https://github.com/jazzband/pip-tools.git@9cb41d828fcb0967a32cc140c1dcaca94e5f4daa#egg=piptools
 prettytoml==0.3

diff --git a/pipenv/patched/pew/LICENSE b/pipenv/patched/pew/LICENSE
diff --git a/pipenv/patched/pew/__init__.py b/pipenv/patched/pew/__init__.py
diff --git a/pipenv/patched/pew/__main__.py b/pipenv/patched/pew/__main__.py
diff --git a/pipenv/patched/pew/_print_utils.py b/pipenv/patched/pew/_print_utils.py
diff --git a/pipenv/patched/pew/_utils.py b/pipenv/patched/pew/_utils.py
diff --git a/pipenv/patched/pew/_win_utils.py b/pipenv/patched/pew/_win_utils.py