Date: Friday, August 23, 2019 @ 07:36:20 Author: felixonmars Revision: 360566
upgpkg: python-pip 19.2.2-1 Modified: python-pip/trunk/PKGBUILD Deleted: python-pip/trunk/progress.patch ----------------+ PKGBUILD | 17 +++-------------- progress.patch | 21 --------------------- 2 files changed, 3 insertions(+), 35 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-08-23 07:32:53 UTC (rev 360565) +++ PKGBUILD 2019-08-23 07:36:20 UTC (rev 360566) @@ -3,7 +3,7 @@ # Contributor: Sebastien Binet <binet@lblbox> pkgname=('python-pip' 'python2-pip') -pkgver=19.0.3 +pkgver=19.2.2 pkgrel=1 pkgdesc="The PyPA recommended tool for installing Python packages" url="https://pip.pypa.io/" @@ -16,24 +16,13 @@ checkdepends=('python-pytest-runner' 'python-scripttest' 'python-virtualenv' 'python-pretend' 'python-yaml' 'python-mock' 'python-freezegun' 'python-pip' 'python-wheel' 'git' 'subversion') -source=("pip-${pkgver}.tar.gz::https://github.com/pypa/pip/archive/${pkgver}.tar.gz" - progress.patch - https://github.com/pypa/pip/commit/8ef3283fcf7c7c5537f305a374355edc96f40d3d.patch) -sha512sums=('f56df1e2fe18eccc4dcba66b0a93a933eb94d12ed0f31d3923662fb85075192674c98bbc00dd48185b1d87cf28a64a6dc321de524e4ccb39a8877b3d5cf578e1' - '77f48f1ae3c977087630a2009e55d38dc6daa53b08767e3aa2fa51405f76de0291c48cebd5e9dc42346f14bb43189f1f49a325faffde9ce63a4377b63541a296' - 'b6cac141a701fde6726d48e51414c6003061c435a6af9cc8ff681365db5a3e24c446ea3227a662f10264332a59582a788576934ff0613fcc46d21ef665c0428e') +source=("pip-${pkgver}.tar.gz::https://github.com/pypa/pip/archive/${pkgver}.tar.gz") +sha512sums=('ca634925e21aba338aa65f80d258833c6622b4c1d85eaf827fa5439aed62d7c6d64fde91cfebc05bd83eb215b019b690379cf5c4ac85a2f32d6357e6bd95fd88') 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 - - # fix vendor import - patch -Np1 -i ../8ef3283fcf7c7c5537f305a374355edc96f40d3d.patch - rm -rf src/pip/_vendor/!(__init__.py) sed -i -e 's/DEBUNDLED = False/DEBUNDLED = True/' \ src/pip/_vendor/__init__.py Deleted: progress.patch =================================================================== --- progress.patch 2019-08-23 07:32:53 UTC (rev 360565) +++ progress.patch 2019-08-23 07:36:20 UTC (rev 360566) @@ -1,21 +0,0 @@ -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"