[arch-commits] Commit in python-pip/trunk (PKGBUILD progress.patch)

[Jan Steffens]

    Date: Friday, March 8, 2019 @ 09:13:29
  Author: heftig
Revision: 347433

18.1-2: Hotfix pip after progress broke it

Added:
  python-pip/trunk/progress.patch
Modified:
  python-pip/trunk/PKGBUILD

----------------+
 PKGBUILD       |   12 +++++++++---
 progress.patch |   21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-08 08:11:38 UTC (rev 347432)
+++ PKGBUILD	2019-03-08 09:13:29 UTC (rev 347433)
@@ -4,7 +4,7 @@
 
 pkgname=('python-pip' 'python2-pip')
 pkgver=18.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The PyPA recommended tool for installing Python packages"
 url="https://pip.pypa.io/"
 arch=('any')
@@ -15,13 +15,19 @@
 makedepends=("${_deps[@]/#/python-}" "${_deps[@]/#/python2-}" 'python2-ipaddress' 'python-sphinx')
 checkdepends=('python-pytest-runner' 'python-scripttest' 'python-virtualenv' 'python-pretend'
               'python-yaml' 'python-mock' 'python-freezegun')
-source=("pip-${pkgver}.tar.gz::https://github.com/pypa/pip/archive/${pkgver}.tar.gz")
-sha512sums=('ddb67ad52c2b4f0cae89e11bd90dbd20275fce0ee34a8e0929210a8907cd61c2298221a4ddf1e7b196b0274241eb88097decbbb84196ab30dd4e979e7378d91f')
+source=("pip-${pkgver}.tar.gz::https://github.com/pypa/pip/archive/${pkgver}.tar.gz"
+        progress.patch)
+sha512sums=('ddb67ad52c2b4f0cae89e11bd90dbd20275fce0ee34a8e0929210a8907cd61c2298221a4ddf1e7b196b0274241eb88097decbbb84196ab30dd4e979e7378d91f'
+            '77f48f1ae3c977087630a2009e55d38dc6daa53b08767e3aa2fa51405f76de0291c48cebd5e9dc42346f14bb43189f1f49a325faffde9ce63a4377b63541a296')
 
 shopt -s extglob
 prepare() {
   cd "$srcdir/pip-$pkgver"
 
+  # Fix compat with python-progress 1.5
+  # https://github.com/pypa/pip/pull/6319
+  patch -Np1 -i ../progress.patch
+
   rm -rf src/pip/_vendor/!(__init__.py)
   sed -i -e 's/DEBUNDLED = False/DEBUNDLED = True/' \
          -e '/cachecontrol/a\    vendored("pep517")' \

Added: progress.patch
===================================================================
--- progress.patch	                        (rev 0)
+++ progress.patch	2019-03-08 09:13:29 UTC (rev 347433)
@@ -0,0 +1,21 @@
+diff -u -r pip-18.1/src/pip/_internal/utils/ui.py pip-18.1-p/src/pip/_internal/utils/ui.py
+--- pip-18.1/src/pip/_internal/utils/ui.py	2018-10-05 09:07:26.000000000 +0000
++++ pip-18.1-p/src/pip/_internal/utils/ui.py	2019-03-08 08:51:47.324230770 +0000
+@@ -12,7 +12,7 @@
+     Bar, ChargingBar, FillingCirclesBar, FillingSquaresBar, IncrementalBar,
+     ShadyBar,
+ )
+-from pip._vendor.progress.helpers import HIDE_CURSOR, SHOW_CURSOR, WritelnMixin
++from pip._vendor.progress import HIDE_CURSOR, SHOW_CURSOR
+ from pip._vendor.progress.spinner import Spinner
+ 
+ from pip._internal.utils.compat import WINDOWS
+@@ -241,7 +241,7 @@
+ 
+ 
+ class DownloadProgressSpinner(WindowsMixin, InterruptibleMixin,
+-                              DownloadProgressMixin, WritelnMixin, Spinner):
++                              DownloadProgressMixin, Spinner):
+ 
+     file = sys.stdout
+     suffix = "%(downloaded)s %(download_speed)s"