From 289eac386f7f2651db5fe27203c895e87b499dfc Mon Sep 17 00:00:00 2001 From: Dan Ryan Date: Wed, 15 May 2019 01:27:42 -0400 Subject: [PATCH] Update vendored dependencies Signed-off-by: Dan Ryan --- news/3298.vendor.rst | 24 +++++++----- pipenv/vendor/vendor.txt | 30 +++++++-------- .../patches/vendor/vistir-imports.patch | 38 ++++++++++--------- 3 files changed, 50 insertions(+), 42 deletions(-) diff --git a/news/3298.vendor.rst b/news/3298.vendor.rst index 40f9b510..cab9a50b 100644 --- a/news/3298.vendor.rst +++ b/news/3298.vendor.rst @@ -1,28 +1,34 @@ Updated vendored dependencies: - **attrs**: ``18.2.0`` => ``19.1.0`` - - **certifi**: ``2018.10.15`` => ``2018.11.29`` + - **certifi**: ``2018.10.15`` => ``2019.3.9`` - **cached_property**: ``1.4.3`` => ``1.5.1`` + - **cerberus**: ``1.2.0`` => ``1.3.1`` + - **click-completion**: ``0.5.0`` => ``0.5.1`` - **colorama**: ``0.3.9`` => ``0.4.1`` + - **distlib**: ``0.2.8`` => ``0.2.9`` - **idna**: ``2.7`` => ``2.8`` + - **jinja2**: ``2.10.0`` => ``2.10.1`` - **markupsafe**: ``1.0`` => ``1.1.1`` - **orderedmultidict**: ``(new)`` => ``1.0`` - **packaging**: ``18.0`` => ``19.0`` - - **parse**: ``1.9.0`` => ``1.11.1`` + - **parse**: ``1.9.0`` => ``1.12.0`` - **pathlib2**: ``2.3.2`` => ``2.3.3`` - **pep517**: ``(new)`` => ``0.5.0`` + - **pexpect**: ``4.6.0`` => ``4.7.0`` - **pipdeptree**: ``0.13.0`` => ``0.13.2`` - **pyparsing**: ``2.2.2`` => ``2.3.1`` - - **python-dotenv**: ``0.9.1`` => ``0.10.1`` - - **pythonfinder**: ``1.1.10`` => ``1.2.0`` + - **python-dotenv**: ``0.9.1`` => ``0.10.2`` + - **pythonfinder**: ``1.1.10`` => ``1.2.1`` - **pytoml**: ``(new)`` => ``0.1.20`` - **requests**: ``2.20.1`` => ``2.21.0`` - - **requirementslib**: ``1.3.3`` => ``1.4.2`` - - **shellingham**: ``1.2.7`` => ``1.2.8`` + - **requirementslib**: ``1.3.3`` => ``1.5.0`` + - **scandir**: ``1.9.0`` => ``1.10.0`` + - **shellingham**: ``1.2.7`` => ``1.3.1`` - **six**: ``1.11.0`` => ``1.12.0`` - **tomlkit**: ``0.5.2`` => ``0.5.3`` - - **urllib3**: ``1.24`` => ``1.24.1`` - - **vistir**: ``0.3.0`` => ``0.3.1`` - - **yaspin**: ``0.14.0`` => ``0.14.1`` + - **urllib3**: ``1.24`` => ``1.25.2`` + - **vistir**: ``0.3.0`` => ``0.4.1`` + - **yaspin**: ``0.14.0`` => ``0.14.3`` - Removed vendored dependency **cursor**. diff --git a/pipenv/vendor/vendor.txt b/pipenv/vendor/vendor.txt index f1fe99c0..c5ce4c3f 100644 --- a/pipenv/vendor/vendor.txt +++ b/pipenv/vendor/vendor.txt @@ -3,48 +3,48 @@ backports.shutil_get_terminal_size==1.0.0 backports.weakref==1.0.post1 blindspin==2.0.1 click==7.0 -click-completion==0.5.0 +click-completion==0.5.1 click-didyoumean==0.0.3 colorama==0.4.1 delegator.py==0.1.1 - pexpect==4.6.0 + pexpect==4.7.0 ptyprocess==0.6.0 -python-dotenv==0.10.1 +python-dotenv==0.10.2 first==2.0.1 iso8601==0.1.12 -jinja2==2.10 +jinja2==2.10. markupsafe==1.1.1 -parse==1.11.1 +parse==1.12.0 pathlib2==2.3.3 - scandir==1.9 + scandir==1.10 pipdeptree==0.13.2 pipreqs==0.4.9 docopt==0.6.2 yarg==0.1.9 -pythonfinder==1.2.0 +pythonfinder==1.2.1 requests==2.21.0 chardet==3.0.4 idna==2.8 - urllib3==1.24.1 - certifi==2018.11.29 -requirementslib==1.4.2 + urllib3==1.25.2 + certifi==2019.3.9 +requirementslib==1.5.0 attrs==19.1.0 - distlib==0.2.8 + distlib==0.2.9 packaging==19.0 pyparsing==2.3.1 git+https://github.com/sarugaku/plette.git@master#egg=plette tomlkit==0.5.3 -shellingham==1.2.8 +shellingham==1.3.1 six==1.12.0 semver==2.8.1 shutilwhich==1.1.0 toml==0.10.0 cached-property==1.5.1 -vistir==0.3.1 +vistir==0.4.1 pip-shims==0.3.2 enum34==1.1.6 -yaspin==0.14.1 -cerberus==1.2 +yaspin==0.14.3 +cerberus==1.3.1 resolvelib==0.2.2 backports.functools_lru_cache==1.5 pep517==0.5.0 diff --git a/tasks/vendoring/patches/vendor/vistir-imports.patch b/tasks/vendoring/patches/vendor/vistir-imports.patch index d1dc4e3a..725e8a56 100644 --- a/tasks/vendoring/patches/vendor/vistir-imports.patch +++ b/tasks/vendoring/patches/vendor/vistir-imports.patch @@ -1,8 +1,8 @@ diff --git a/pipenv/vendor/vistir/backports/tempfile.py b/pipenv/vendor/vistir/backports/tempfile.py -index 483a479a..43470a6e 100644 +index f5594a2d..a3d7f3df 100644 --- a/pipenv/vendor/vistir/backports/tempfile.py +++ b/pipenv/vendor/vistir/backports/tempfile.py -@@ -13,7 +13,7 @@ import six +@@ -12,7 +12,7 @@ import six try: from weakref import finalize except ImportError: @@ -10,33 +10,35 @@ index 483a479a..43470a6e 100644 + from pipenv.vendor.backports.weakref import finalize - __all__ = ["finalize", "NamedTemporaryFile"] + def fs_encode(path): diff --git a/pipenv/vendor/vistir/compat.py b/pipenv/vendor/vistir/compat.py -index 9ae33fdc..ec3b65cb 100644 +index b5904bc7..a44aafbe 100644 --- a/pipenv/vendor/vistir/compat.py +++ b/pipenv/vendor/vistir/compat.py -@@ -43,12 +43,12 @@ if sys.version_info >= (3, 5): - from functools import lru_cache - else: +@@ -43,7 +43,7 @@ __all__ = [ + if sys.version_info >= (3, 5): # pragma: no cover + from pathlib import Path + else: # pragma: no cover - from pathlib2 import Path -- from backports.functools_lru_cache import lru_cache + from pipenv.vendor.pathlib2 import Path + + if six.PY3: # pragma: no cover + # Only Python 3.4+ is supported +@@ -53,14 +53,14 @@ if six.PY3: # pragma: no cover + from weakref import finalize + else: # pragma: no cover + # Only Python 2.7 is supported +- from backports.functools_lru_cache import lru_cache + from pipenv.vendor.backports.functools_lru_cache import lru_cache - - - if sys.version_info < (3, 3): + from .backports.functools import partialmethod # type: ignore - from backports.shutil_get_terminal_size import get_terminal_size + from pipenv.vendor.backports.shutil_get_terminal_size import get_terminal_size + from .backports.surrogateescape import register_surrogateescape + register_surrogateescape() NamedTemporaryFile = _NamedTemporaryFile - else: - from tempfile import NamedTemporaryFile -@@ -57,7 +57,7 @@ else: - try: - from weakref import finalize - except ImportError: - from backports.weakref import finalize # type: ignore + from pipenv.vendor.backports.weakref import finalize # type: ignore try: - from functools import partialmethod + # Introduced Python 3.5