Merge pull request #2739 from pypa/add-vistir

Vendor new libraries: vistir and pip_shims

news/2639.bugfix

@@ -0,0 +1,2 @@
+Fixed a bug which caused attempted hashing of ``ssh://`` style URIs which could cause failures during installation of private ssh repositories.
+- Corrected path conversion issues which caused certain editable VCS paths to be converted to ``ssh://`` URIs improperly.

news/2639.vendor

@@ -0,0 +1,14 @@
+- Vendored new libraries ``vistir`` and ``pip-shims``, ``tomlkit``, ``modutil``, and ``plette``.
+
+- Update vendored libraries:
+  - ``scandir`` to ``1.9.0``
+  - ``click-completion`` to ``0.4.1``
+  - ``semver`` to ``2.8.1``
+  - ``shellingham`` to ``1.2.4``
+  - ``pytoml`` to ``0.1.18``
+  - ``certifi`` to ``2018.8.24``
+  - ``ptyprocess`` to ``0.6.0``
+  - ``requirementslib`` to ``1.1.5``
+  - ``pythonfinder`` to ``1.0.2``
+  - ``pipdeptree`` to ``0.13.0``
+  - ``python-dotenv`` to ``0.9.1``

pipenv/patched/piptools/repositories/pypi.py

@@ -72,7 +72,7 @@ def get_hash(self, location):
             # hash url WITH fragment
             hash_value = self.get(new_location.url)
         if not hash_value:
-            hash_value = self._get_file_hash(new_location)
+            hash_value = self._get_file_hash(new_location) if not new_location.url.startswith("ssh") else None
             hash_value = hash_value.encode('utf8')
         if can_hash:
             self.set(new_location.url, hash_value)

pipenv/patched/piptools/utils.py

@@ -341,7 +341,7 @@ def fs_str(string):
 _fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding()
 
 
-# Borrowed from Pew.
+# Borrowed from pew to avoid importing pew which imports psutil
 # See https://github.com/berdario/pew/blob/master/pew/_utils.py#L82
 @contextmanager
 def temp_environ():

pipenv/patched/safety/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """pyup.io"""
 __email__ = '[email protected]'
-__version__ = '1.8.1'
+__version__ = '1.8.4'

pipenv/patched/safety/formatter.py

@@ -113,7 +113,10 @@ def render(vulns, full, checked_packages, used_db):
                     for chunk in [descr[i:i + 76] for i in range(0, len(descr), 76)]:
 
                         for line in chunk.splitlines():
-                            table.append("│ {:76} │".format(line))
+                            try:
+                                table.append("│ {:76} │".format(line.encode('utf-8')))
+                            except TypeError:
+                                table.append("│ {:76} │".format(line))
                     # append the REPORT_SECTION only if this isn't the last entry
                     if n + 1 < len(vulns):
                         table.append(SheetReport.REPORT_SECTION)

pipenv/project.py

@@ -24,7 +24,6 @@
     proper_case,
     find_requirements,
     is_editable,
-    is_vcs,
     cleanup_toml,
     is_installable_file,
     is_valid_url,
@@ -45,6 +44,7 @@
     PIPENV_PYTHON,
     PIPENV_DEFAULT_PYTHON_VERSION,
 )
+from requirementslib.utils import is_vcs
 
 
 def _normalized(p):