pip/utils/__init__.py | 36 27 + 9 - 0 !
1 file changed, 27 insertions(+), 9 deletions(-)

 prevent pip from removing system packages.

Adjust is_local() to consider OS-owned paths non-local.  Fix the error
message for is_local() in the non-virtualenv case.

pip/_vendor/__init__.py | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 devendorize wheels and use system built wheels.

Patch-Name: debundle.patch

pip/_vendor/__init__.py | 8 6 + 2 - 0 !
1 file changed, 6 insertions(+), 2 deletions(-)

 debian already unbundles things from requests.

Patch-Name: handle-unbundled-requests.patch

docs/user_guide.rst | 6 4 + 2 - 0 !
pip/commands/install.py | 20 19 + 1 - 0 !
2 files changed, 23 insertions(+), 3 deletions(-)

 default to --user in non-virtual environments.

When running as a normal user in a non-virtual environment, default to
--user and --ignore-installed.  When inside virtual environments or when
running as root, keep the default behavior.

pip/cmdoptions.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 set --disable-pip-version-check=true by default.

Patch-Name: disable-pip-version-check.patch

pip/_vendor/vendor.txt | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 use alternative html5lib beta version number.

This matches what's in the Debian archive.

Patch-Name: html5lib-alternative-beta-name.patch

pip/index.py | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 properly catch requests' httperror in index.py
 This resolves issue #4195.
 .
 In index.py's index retrieval routine we were catching
 requests.HTTPError to log and ignore 404s and other similar HTTP server
 errors when pulling from (extra-)index-urls. Unfortunately, the actual
 path to that exception is requests.exceptions.HTTPError and the alias we
 were using does not work when pip is installed with unvendored libs as
 with the debian packaged pip.
 .
 Thankfully the fix is simple. Import and use
 requests.exceptions.HTTPError. This comes with the added bonus of
 fitting in with the existing handling for RetryError and SSLError. With
 this change in place upstream pip and downstream packaged pip should
 both catch this exception properly.
 .
 Note: I've not added any tests cases as I'm unsure how to test the
 distro packaging case within pip's testsuite. However, the existing test
 suite should hopefully cover that this isn't a regression and I've
 manually confirmed that this works with a hacked up debian package
 install. Also this is how we handle RetryError and SSLError.