diff -Nru python-pip-9.0.1/debian/changelog python-pip-9.0.1/debian/changelog --- python-pip-9.0.1/debian/changelog 2017-01-11 20:48:53.000000000 +0000 +++ python-pip-9.0.1/debian/changelog 2020-04-30 20:52:38.000000000 +0000 @@ -1,3 +1,48 @@ +python-pip (9.0.1-2.3~ubuntu1.18.04.1+ppa1) bionic; urgency=medium + + * Support pypy3 for the PyPy PPA (Closes: #945187, LP: #1874157). + + -- Stefano Rivera Thu, 30 Apr 2020 13:52:38 -0700 + +python-pip (9.0.1-2.3~ubuntu1.18.04.1) bionic; urgency=medium + + * d/p/bug1822842.patch: Pick fix to resolve issues when using + --{extra-}-index-urls due to de-bundling of dependencies in + distro versions of pip (LP: #1822842). + + -- James Page Wed, 03 Apr 2019 10:23:03 +0100 + +python-pip (9.0.1-2.3~ubuntu1) bionic-proposed; urgency=medium + + * SRU: LP: #1771624. + + -- Matthias Klose Wed, 16 May 2018 12:28:25 -0400 + +python-pip (9.0.1-2.3) unstable; urgency=medium + + * Non-maintainer upload. + * Build-depend on python3-idna. Closes: #897121, #896998. + * debian/pip.dependencies: Add idna. + * debian/rules: run dirtbike for idna. + + -- Matthias Klose Wed, 02 May 2018 12:35:24 +0200 + +python-pip (9.0.1-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/pip.dependencies: Add certifi. + * debian/rules: run dirtbike for certifi. + * pip/_vendor/__init__.py: Use the unvendored urllib3. Closes: #896998. + + -- Matthias Klose Sat, 28 Apr 2018 15:31:03 +0200 + +python-pip (9.0.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * python3-pip: Depend on python3-distutils. Closes: #896390. + + -- Matthias Klose Thu, 26 Apr 2018 08:19:13 +0200 + python-pip (9.0.1-2) unstable; urgency=medium * d/control: Update python-setuptools Built-Using version. diff -Nru python-pip-9.0.1/debian/control python-pip-9.0.1/debian/control --- python-pip-9.0.1/debian/control 2017-01-11 20:48:53.000000000 +0000 +++ python-pip-9.0.1/debian/control 2019-04-03 09:23:03.000000000 +0000 @@ -1,7 +1,8 @@ Source: python-pip Section: python Priority: optional -Maintainer: Debian Python Modules Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Barry Warsaw , Carl Chenet , Jeff Licquia , @@ -17,11 +18,13 @@ python3-all, python3-appdirs, python3-cachecontrol, + python3-certifi, python3-chardet, python3-colorama, python3-distlib, python3-distro, python3-html5lib, + python3-idna, python3-lockfile, python3-mock, python3-packaging, @@ -61,6 +64,7 @@ Package: python3-pip Architecture: all Depends: ca-certificates, + python3-distutils, python-pip-whl (= ${binary:Version}), ${misc:Depends}, ${python3:Depends}, diff -Nru python-pip-9.0.1/debian/patches/bug1822842.patch python-pip-9.0.1/debian/patches/bug1822842.patch --- python-pip-9.0.1/debian/patches/bug1822842.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-pip-9.0.1/debian/patches/bug1822842.patch 2019-04-03 09:22:48.000000000 +0000 @@ -0,0 +1,46 @@ +Description: 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. +Author: Clark Boylan +Origin: upstream, https://github.com/pypa/pip/pull/6367 +Bug-Debian: https://bugs.debian.org/837764 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-pip/+bug/1822842 + +--- a/pip/index.py ++++ b/pip/index.py +@@ -34,7 +34,7 @@ from pip._vendor import html5lib, reques + from pip._vendor.packaging.version import parse as parse_version + from pip._vendor.packaging.utils import canonicalize_name + from pip._vendor.packaging import specifiers +-from pip._vendor.requests.exceptions import SSLError ++from pip._vendor.requests.exceptions import HTTPError, SSLError + from pip._vendor.distlib.compat import unescape + + +@@ -809,7 +809,7 @@ class HTMLPage(object): + return + + inst = cls(resp.content, resp.url, resp.headers) +- except requests.HTTPError as exc: ++ except HTTPError as exc: + cls._handle_fail(link, exc, url) + except SSLError as exc: + reason = ("There was a problem confirming the ssl certificate: " diff -Nru python-pip-9.0.1/debian/patches/debundle.patch python-pip-9.0.1/debian/patches/debundle.patch --- python-pip-9.0.1/debian/patches/debundle.patch 2017-01-11 20:48:53.000000000 +0000 +++ python-pip-9.0.1/debian/patches/debundle.patch 2020-04-30 20:51:24.000000000 +0000 @@ -8,11 +8,9 @@ pip/_vendor/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py -index bee5f5e..7e9da3e 100644 --- a/pip/_vendor/__init__.py +++ b/pip/_vendor/__init__.py -@@ -14,13 +14,13 @@ import sys +@@ -14,13 +14,16 @@ # Downstream redistributors which have debundled our dependencies should also # patch this value to be true. This will trigger the additional patching # to cause things like "six" to be available as pip. @@ -24,7 +22,10 @@ # is done to support downstream re-distributors like Debian and Fedora who # wish to create their own Wheels for our dependencies to aid in debundling. -WHEEL_DIR = os.path.abspath(os.path.dirname(__file__)) -+WHEEL_DIR = os.path.abspath(os.path.join(sys.prefix, 'share', 'python-wheels')) ++prefix = sys.prefix ++if sys.prefix.startswith('/usr/lib/pypy'): ++ prefix = '/usr' ++WHEEL_DIR = os.path.abspath(os.path.join(prefix, 'share', 'python-wheels')) # Define a small helper function to alias our vendored modules to the real ones diff -Nru python-pip-9.0.1/debian/patches/series python-pip-9.0.1/debian/patches/series --- python-pip-9.0.1/debian/patches/series 2017-01-11 20:48:53.000000000 +0000 +++ python-pip-9.0.1/debian/patches/series 2019-04-03 09:22:48.000000000 +0000 @@ -4,3 +4,5 @@ set_user_default.patch disable-pip-version-check.patch html5lib-alternative-beta-name.patch +use-unvendored-urllib3.diff +bug1822842.patch diff -Nru python-pip-9.0.1/debian/patches/use-unvendored-urllib3.diff python-pip-9.0.1/debian/patches/use-unvendored-urllib3.diff --- python-pip-9.0.1/debian/patches/use-unvendored-urllib3.diff 1970-01-01 00:00:00.000000000 +0000 +++ python-pip-9.0.1/debian/patches/use-unvendored-urllib3.diff 2019-04-03 09:22:48.000000000 +0000 @@ -0,0 +1,33 @@ +--- python-pip-9.0.1.orig/pip/__init__.py ++++ python-pip-9.0.1/pip/__init__.py +@@ -18,7 +18,10 @@ import re + # to add socks as yet another dependency for pip, nor do I want to allow-stder + # in the DEP-8 tests, so just suppress the warning. pdb tells me this has to + # be done before the import of pip.vcs. +-from pip._vendor.requests.packages.urllib3.exceptions import DependencyWarning ++try: ++ from pip._vendor.requests.packages.urllib3.exceptions import DependencyWarning ++except ImportError: ++ from urllib3.exceptions import DependencyWarning + warnings.filterwarnings("ignore", category=DependencyWarning) # noqa + + +@@ -29,10 +32,14 @@ from pip.vcs import git, mercurial, subv + from pip.baseparser import ConfigOptionParser, UpdatingDefaultsHelpFormatter + from pip.commands import get_summaries, get_similar_commands + from pip.commands import commands_dict +-from pip._vendor.requests.packages.urllib3.exceptions import ( +- InsecureRequestWarning, +-) +- ++try: ++ from pip._vendor.requests.packages.urllib3.exceptions import ( ++ InsecureRequestWarning, ++ ) ++except ImportError: ++ from urllib3.exceptions import ( ++ InsecureRequestWarning, ++ ) + + # assignment for flake8 to be happy + diff -Nru python-pip-9.0.1/debian/pip.dependencies python-pip-9.0.1/debian/pip.dependencies --- python-pip-9.0.1/debian/pip.dependencies 2017-01-11 20:48:53.000000000 +0000 +++ python-pip-9.0.1/debian/pip.dependencies 2018-05-02 10:35:24.000000000 +0000 @@ -1,6 +1,8 @@ +certifi chardet colorama distlib +idna html5lib requests setuptools diff -Nru python-pip-9.0.1/debian/rules python-pip-9.0.1/debian/rules --- python-pip-9.0.1/debian/rules 2017-01-11 20:48:53.000000000 +0000 +++ python-pip-9.0.1/debian/rules 2018-05-02 10:35:24.000000000 +0000 @@ -46,11 +46,13 @@ mkdir -p $(CURDIR)/debian/python-pip-whl/usr/share/python-wheels dirtbike appdirs dirtbike CacheControl + dirtbike certifi dirtbike chardet dirtbike colorama dirtbike distlib dirtbike distro dirtbike html5lib + dirtbike idna dirtbike ipaddress dirtbike lockfile dirtbike packaging