diff -Nru python-pip-20.0.2/debian/changelog python-pip-20.0.2/debian/changelog --- python-pip-20.0.2/debian/changelog 2020-04-20 19:59:57.000000000 +0000 +++ python-pip-20.0.2/debian/changelog 2020-04-21 15:21:38.000000000 +0000 @@ -1,3 +1,12 @@ +python-pip (20.0.2-5ubuntu1) focal; urgency=medium + + * In python-pip-whl: Use setuptools 44 from our python 2 stack, for now. + This is a hack for focal, to keep Python 2 compatibility for virtualenv. + In the future, virtualenv will probably have to download wheels for + python 2. + + -- Stefano Rivera Tue, 21 Apr 2020 08:21:38 -0700 + python-pip (20.0.2-5) unstable; urgency=medium [ Stefano Rivera ] diff -Nru python-pip-20.0.2/debian/control python-pip-20.0.2/debian/control --- python-pip-20.0.2/debian/control 2020-04-20 19:59:57.000000000 +0000 +++ python-pip-20.0.2/debian/control 2020-04-21 15:21:38.000000000 +0000 @@ -9,6 +9,9 @@ Build-Depends: debhelper-compat (= 11), dh-python, dirtbike, + python-mock, + python-pkg-resources, + python-setuptools (>= 44.0.0), python3, python3-appdirs (>= 1.4.3), python3-cachecontrol (>= 0.12.6), diff -Nru python-pip-20.0.2/debian/dirtbike2 python-pip-20.0.2/debian/dirtbike2 --- python-pip-20.0.2/debian/dirtbike2 1970-01-01 00:00:00.000000000 +0000 +++ python-pip-20.0.2/debian/dirtbike2 2020-04-21 15:21:38.000000000 +0000 @@ -0,0 +1,15 @@ +#!/bin/sh +# This is a horrible hack to run dirtbike under Python 2, so it can find python +# 2 libraries. + +set -eu + +if [ ! -d /tmp/dirtbike2 ]; then + mkdir /tmp/dirtbike2 + # Wheel isn't available on python2 any more, so we just copy it from python3 + cp -a /usr/lib/python3/dist-packages/wheel* /tmp/dirtbike2/ + cp -a /usr/lib/python3/dist-packages/dirtbike* /tmp/dirtbike2/ +fi + +export PYTHONPATH=/tmp/dirtbike2 +exec /usr/bin/python2 /usr/bin/dirtbike "$@" diff -Nru python-pip-20.0.2/debian/rules python-pip-20.0.2/debian/rules --- python-pip-20.0.2/debian/rules 2020-04-20 19:59:57.000000000 +0000 +++ python-pip-20.0.2/debian/rules 2020-04-21 15:21:38.000000000 +0000 @@ -47,13 +47,13 @@ dirtbike lockfile dirtbike packaging dirtbike pep517 - dirtbike pkg_resources + debian/dirtbike2 pkg_resources dirtbike progress dirtbike pyparsing dirtbike pytoml dirtbike requests dirtbike retrying - dirtbike setuptools + debian/dirtbike2 setuptools dirtbike six dirtbike urllib3 dirtbike webencodings