[arch-commits] Commit in python-pip/repos/extra-any (PKGBUILD PKGBUILD progress.patch)
Jan Steffens
heftig at archlinux.org
Fri Mar 8 09:13:55 UTC 2019
Date: Friday, March 8, 2019 @ 09:13:55
Author: heftig
Revision: 347434
archrelease: copy trunk to extra-any
Added:
python-pip/repos/extra-any/PKGBUILD
(from rev 347433, python-pip/trunk/PKGBUILD)
python-pip/repos/extra-any/progress.patch
(from rev 347433, python-pip/trunk/progress.patch)
Deleted:
python-pip/repos/extra-any/PKGBUILD
----------------+
PKGBUILD | 178 ++++++++++++++++++++++++++++---------------------------
progress.patch | 21 ++++++
2 files changed, 113 insertions(+), 86 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-03-08 09:13:29 UTC (rev 347433)
+++ PKGBUILD 2019-03-08 09:13:55 UTC (rev 347434)
@@ -1,86 +0,0 @@
-# Maintainer: Dan McGee <dan at archlinux.org>
-# Contributor: Eli Schwartz <eschwartz at archlinux.org>
-# Contributor: Sebastien Binet <binet at lblbox>
-
-pkgname=('python-pip' 'python2-pip')
-pkgver=18.1
-pkgrel=1
-pkgdesc="The PyPA recommended tool for installing Python packages"
-url="https://pip.pypa.io/"
-arch=('any')
-license=('MIT')
-_deps=('setuptools' 'appdirs' 'cachecontrol' 'colorama' 'distlib' 'distro' 'html5lib' 'lockfile'
- 'msgpack' 'six' 'packaging' 'pep517' 'progress' 'pytoml' 'retrying' 'requests' 'urllib3'
- 'webencodings')
-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')
-
-shopt -s extglob
-prepare() {
- cd "$srcdir/pip-$pkgver"
-
- rm -rf src/pip/_vendor/!(__init__.py)
- sed -i -e 's/DEBUNDLED = False/DEBUNDLED = True/' \
- -e '/cachecontrol/a\ vendored("pep517")' \
- src/pip/_vendor/__init__.py
-}
-
-build() {
- cd "$srcdir/pip-$pkgver"
-
- python setup.py build
- python2 setup.py build
-
- cd docs/
- PYTHONPATH="$srcdir/pip-$pkgver/src/" sphinx-build -W -b man -d build/doctrees/man man build/man -c html
- mkdir -p build/man-pip2
- cd build/man
- for manfile in *; do
- sed 's/pip/pip2/g;s/PIP/PIP2/g' $manfile > ../man-pip2/${manfile/pip/pip2}
- done
-}
-
-check() {
- cd "$srcdir/pip-$pkgver"
- python setup.py pytest || warning "Tests failed"
-}
-
-package_python-pip() {
- depends=("${_deps[@]/#/python-}")
-
- cd "$srcdir/pip-$pkgver"
- python setup.py install --prefix=/usr --root="$pkgdir"
-
- install -D -m644 LICENSE.txt \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- install -Dm644 -t "$pkgdir"/usr/share/man/man1 docs/build/man/*
-
- PYTHONPATH="$pkgdir"/usr/lib/python3.7/site-packages "$pkgdir"/usr/bin/pip completion --bash \
- | install -Dm644 /dev/stdin "$pkgdir"/usr/share/bash-completion/completions/pip
-}
-
-package_python2-pip() {
- depends=("${_deps[@]/#/python2-}" 'python2-ipaddress')
- conflicts=('python-pyinstall')
- replaces=('python-pyinstall')
-
- cd "$srcdir/pip-$pkgver"
- python2 setup.py install --prefix=/usr --root="$pkgdir"
-
- mv "$pkgdir/usr/bin/pip" "$pkgdir/usr/bin/pip2"
- sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" \
- ${pkgdir}/usr/lib/python2.7/site-packages/pip/__init__.py
- python2 -m compileall ${pkgdir}/usr/lib/python2.7/site-packages/pip/__init__.py
-
- install -D -m644 LICENSE.txt \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- install -Dm644 -t "$pkgdir"/usr/share/man/man1 docs/build/man-pip2/*
-
- PYTHONPATH="$pkgdir"/usr/lib/python2.7/site-packages "$pkgdir"/usr/bin/pip2 completion --bash \
- | install -Dm644 /dev/stdin "$pkgdir"/usr/share/bash-completion/completions/pip2
-}
Copied: python-pip/repos/extra-any/PKGBUILD (from rev 347433, python-pip/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-03-08 09:13:55 UTC (rev 347434)
@@ -0,0 +1,92 @@
+# Maintainer: Dan McGee <dan at archlinux.org>
+# Contributor: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Sebastien Binet <binet at lblbox>
+
+pkgname=('python-pip' 'python2-pip')
+pkgver=18.1
+pkgrel=2
+pkgdesc="The PyPA recommended tool for installing Python packages"
+url="https://pip.pypa.io/"
+arch=('any')
+license=('MIT')
+_deps=('setuptools' 'appdirs' 'cachecontrol' 'colorama' 'distlib' 'distro' 'html5lib' 'lockfile'
+ 'msgpack' 'six' 'packaging' 'pep517' 'progress' 'pytoml' 'retrying' 'requests' 'urllib3'
+ 'webencodings')
+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"
+ 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")' \
+ src/pip/_vendor/__init__.py
+}
+
+build() {
+ cd "$srcdir/pip-$pkgver"
+
+ python setup.py build
+ python2 setup.py build
+
+ cd docs/
+ PYTHONPATH="$srcdir/pip-$pkgver/src/" sphinx-build -W -b man -d build/doctrees/man man build/man -c html
+ mkdir -p build/man-pip2
+ cd build/man
+ for manfile in *; do
+ sed 's/pip/pip2/g;s/PIP/PIP2/g' $manfile > ../man-pip2/${manfile/pip/pip2}
+ done
+}
+
+check() {
+ cd "$srcdir/pip-$pkgver"
+ python setup.py pytest || warning "Tests failed"
+}
+
+package_python-pip() {
+ depends=("${_deps[@]/#/python-}")
+
+ cd "$srcdir/pip-$pkgver"
+ python setup.py install --prefix=/usr --root="$pkgdir"
+
+ install -D -m644 LICENSE.txt \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ install -Dm644 -t "$pkgdir"/usr/share/man/man1 docs/build/man/*
+
+ PYTHONPATH="$pkgdir"/usr/lib/python3.7/site-packages "$pkgdir"/usr/bin/pip completion --bash \
+ | install -Dm644 /dev/stdin "$pkgdir"/usr/share/bash-completion/completions/pip
+}
+
+package_python2-pip() {
+ depends=("${_deps[@]/#/python2-}" 'python2-ipaddress')
+ conflicts=('python-pyinstall')
+ replaces=('python-pyinstall')
+
+ cd "$srcdir/pip-$pkgver"
+ python2 setup.py install --prefix=/usr --root="$pkgdir"
+
+ mv "$pkgdir/usr/bin/pip" "$pkgdir/usr/bin/pip2"
+ sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" \
+ ${pkgdir}/usr/lib/python2.7/site-packages/pip/__init__.py
+ python2 -m compileall ${pkgdir}/usr/lib/python2.7/site-packages/pip/__init__.py
+
+ install -D -m644 LICENSE.txt \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ install -Dm644 -t "$pkgdir"/usr/share/man/man1 docs/build/man-pip2/*
+
+ PYTHONPATH="$pkgdir"/usr/lib/python2.7/site-packages "$pkgdir"/usr/bin/pip2 completion --bash \
+ | install -Dm644 /dev/stdin "$pkgdir"/usr/share/bash-completion/completions/pip2
+}
Copied: python-pip/repos/extra-any/progress.patch (from rev 347433, python-pip/trunk/progress.patch)
===================================================================
--- progress.patch (rev 0)
+++ progress.patch 2019-03-08 09:13:55 UTC (rev 347434)
@@ -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"
More information about the arch-commits
mailing list