Skip to content

Commit

Permalink
Vendor boltons
Browse files Browse the repository at this point in the history
Signed-off-by: Dan Ryan <[email protected]>

Update vendored dependencies

Signed-off-by: Dan Ryan <[email protected]>

Fix file handle leaks

- Fix #3020
- Fix #3088
- Patch delegator
- Add weakref finalizer for tempfiles

Signed-off-by: Dan Ryan <[email protected]>

Fix spinner handlers on windows

Signed-off-by: Dan Ryan <[email protected]>

Fix spinner output and encoding issue

Signed-off-by: Dan Ryan <[email protected]>

fix encoding

Signed-off-by: Dan Ryan <[email protected]>

Fix unicode output on windows, fix tomlkit imports

Signed-off-by: Dan Ryan <[email protected]>

Unvendor boltons, fix compatibility, update merge functionalities

Signed-off-by: Dan Ryan <[email protected]>

Update pythonfinder, vistir version, requirementslib version

Signed-off-by: Dan Ryan <[email protected]>

Fix vendoring script

Signed-off-by: Dan Ryan <[email protected]>

Silence pip version checks

Signed-off-by: Dan Ryan <[email protected]>

Add debugging to locking

Signed-off-by: Dan Ryan <[email protected]>
  • Loading branch information
techalchemy committed Oct 30, 2018
1 parent e375eb3 commit 4dac167
Show file tree
Hide file tree
Showing 42 changed files with 1,334 additions and 561 deletions.
File renamed without changes.
1 change: 1 addition & 0 deletions news/3088.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed a bug which caused ``Unexpected EOF`` errors to be thrown when PIP awaited input from users who put login credentials in their environment.
1 change: 1 addition & 0 deletions news/3089.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added windows-compatible spinner via upgraded ``vistir`` dependency.
11 changes: 11 additions & 0 deletions news/3089.vendor.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Updated vendored dependencies:
- ``certifi 2018.08.24 => 2018.10.15``
- ``urllib3 1.23 => 1.24``
- ``requests 2.19.1 => 2.20.0``
- ``shellingham ``1.2.6 => 1.2.7``
- ``tomlkit 0.4.4. => 0.4.6``
- ``vistir 0.1.6 => 0.1.8``
- ``pythonfinder 0.1.2 => 0.1.3``
- ``requirementslib 1.1.9 => 1.1.10``
- ``backports.functools_lru_cache 1.5.0 (new)``
- ``cursor 1.2.0 (new)``
1 change: 1 addition & 0 deletions pipenv/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
sys.path.insert(0, PIPENV_VENDOR)
# Inject patched directory into system path.
sys.path.insert(0, PIPENV_PATCHED)
os.environ["PIP_DISABLE_PIP_VERSION_CHECK"] = "1"
# Hack to make things work better.
try:
if "concurrency" in sys.modules:
Expand Down
6 changes: 3 additions & 3 deletions pipenv/_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ def detach(self):
return False


if six.PY2:
from vistir.compat import ResourceWarning

class ResourceWarning(Warning):
pass

warnings.filterwarnings("ignore", category=ResourceWarning)


def pip_import(module_path, subimport=None, old_path=None):
Expand Down
Loading

0 comments on commit 4dac167

Please sign in to comment.