summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO109
-rw-r--r--PKGBUILD121
2 files changed, 81 insertions, 149 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bc9a816e7165..dcf5649dc4f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,101 +1,34 @@
pkgbase = python-pip-git
pkgdesc = The PyPA recommended tool for installing Python packages
- pkgver = 19.0.3.r119.gd4264dc3
+ pkgver = 23.0.r34.g852deddb9
pkgrel = 1
- url = https://github.com/pypa/pip/
+ url = https://github.com/pypa/pip
arch = any
license = MIT
- checkdepends = python-pytest-runner
+ checkdepends = git
+ checkdepends = python-freezegun
+ checkdepends = python-pytest
+ checkdepends = python-pytest-rerunfailures
+ checkdepends = python-pytest-xdist
checkdepends = python-scripttest
+ checkdepends = python-tomli-w
checkdepends = python-virtualenv
- checkdepends = python-pretend
- checkdepends = python-yaml
- checkdepends = python-mock
- checkdepends = python-freezegun
+ checkdepends = python-werkzeug
+ checkdepends = subversion
+ makedepends = python-build
+ makedepends = python-installer
+ makedepends = python-myst-parser
makedepends = python-setuptools
- makedepends = python-appdirs
- makedepends = python-cachecontrol
- makedepends = python-colorama
- makedepends = python-distlib
- makedepends = python-distro
- makedepends = python-html5lib
- makedepends = python-lockfile
- makedepends = python-msgpack
- makedepends = python-six
- makedepends = python-packaging
- makedepends = python-pep517
- makedepends = python-progress
- makedepends = python-pytoml
- makedepends = python-retrying
- makedepends = python-requests
- makedepends = python-urllib3
- makedepends = python-webencodings
- makedepends = python2-setuptools
- makedepends = python2-appdirs
- makedepends = python2-cachecontrol
- makedepends = python2-colorama
- makedepends = python2-distlib
- makedepends = python2-distro
- makedepends = python2-html5lib
- makedepends = python2-lockfile
- makedepends = python2-msgpack
- makedepends = python2-six
- makedepends = python2-packaging
- makedepends = python2-pep517
- makedepends = python2-progress
- makedepends = python2-pytoml
- makedepends = python2-retrying
- makedepends = python2-requests
- makedepends = python2-urllib3
- makedepends = python2-webencodings
- makedepends = python2-ipaddress
makedepends = python-sphinx
+ makedepends = python-sphinx-copybutton
+ makedepends = python-sphinx-inline-tabs
+ makedepends = python-sphinxcontrib-towncrier
+ depends = python
+ depends = python-attrs
+ depends = python-cryptography
+ depends = python-wheel
conflicts = python-pip
- conflicts = python2-pip
- source = pip-git::git+https://github.com/pypa/pip.git
+ source = pip::git+https://github.com/pypa/pip
sha512sums = SKIP
pkgname = python-pip-git
- depends = python-setuptools
- depends = python-appdirs
- depends = python-cachecontrol
- depends = python-colorama
- depends = python-distlib
- depends = python-distro
- depends = python-html5lib
- depends = python-lockfile
- depends = python-msgpack
- depends = python-six
- depends = python-packaging
- depends = python-pep517
- depends = python-progress
- depends = python-pytoml
- depends = python-retrying
- depends = python-requests
- depends = python-urllib3
- depends = python-webencodings
-
-pkgname = python2-pip-git
- depends = python2-setuptools
- depends = python2-appdirs
- depends = python2-cachecontrol
- depends = python2-colorama
- depends = python2-distlib
- depends = python2-distro
- depends = python2-html5lib
- depends = python2-lockfile
- depends = python2-msgpack
- depends = python2-six
- depends = python2-packaging
- depends = python2-pep517
- depends = python2-progress
- depends = python2-pytoml
- depends = python2-retrying
- depends = python2-requests
- depends = python2-urllib3
- depends = python2-webencodings
- depends = python2-ipaddress
- conflicts = python-pyinstall
- conflicts = python2-pip
- replaces = python-pyinstall
-
diff --git a/PKGBUILD b/PKGBUILD
index c2ff5ff430a0..485be0d2dd45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,80 +1,79 @@
-# Maintainer: Alireza Ayinmehr <alireza.darksun@gmail.com>
-
-pkgname=('python-pip-git' 'python2-pip-git')
-pkgver=19.0.3.r119.gd4264dc3
+# Maintainer: Pellegrino Prevete <pellegrinoprevete@gmail.com>
+# Contributor: Alireza Ayinmehr <alireza.darksun@gmail.com>
+# Contributor: David Runge <dvzrv@archlinux.org>
+# Contributor: Felix Yan <felixonmars@archlinux.org>
+# Contributor: Dan McGee <dan@archlinux.org>
+# Contributor: Eli Schwartz <eschwartz@archlinux.org>
+# Contributor: Sebastien Binet <binet@lblbox>
+
+_py="python"
+_name="pip"
+pkgname="${_py}-${_name}-git"
+pkgver=23.0.r34.g852deddb9
pkgrel=1
pkgdesc="The PyPA recommended tool for installing Python packages"
-url='https://github.com/pypa/pip/'
+_pypi="https://github.com/pypa"
+url="${_pypi}/${_name}"
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')
-conflicts=('python-pip' 'python2-pip')
-source=("pip-git::git+https://github.com/pypa/pip.git")
+depends=(
+ python
+ python-attrs # for vendored rich
+ python-cryptography # for vendored requests and urllib3
+ python-wheel # for internal misc utils
+)
+makedepends=(
+ python-build
+ python-installer
+ python-myst-parser
+ python-setuptools
+ python-sphinx
+ python-sphinx-copybutton
+ python-sphinx-inline-tabs
+ python-sphinxcontrib-towncrier
+)
+checkdepends=(
+ git
+ python-freezegun
+ python-pytest
+ python-pytest-rerunfailures
+ python-pytest-xdist
+ python-scripttest
+ python-tomli-w
+ python-virtualenv
+ python-werkzeug
+ subversion
+)
+conflicts=("${_py}-${_name}")
+source=("${_name}::git+${url}")
sha512sums=('SKIP')
pkgver() {
- cd "pip-git"
+ cd "${_name}"
git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
- cd "$srcdir/pip-git"
-
- python setup.py build
- python2 setup.py build
+ cd "${_name}"
+ python -m build --wheel --no-isolation
cd docs/
- PYTHONPATH="$srcdir/pip-git/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-git"
- python setup.py pytest || warning "Tests failed"
-}
-
-package_python-pip-git() {
- depends=("${_deps[@]/#/python-}")
-
- cd "$srcdir/pip-git"
- 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
+ PYTHONPATH="$srcdir/${_name}/src/" python pip_sphinxext.py
+ PYTHONPATH="$srcdir/${_name}/src/" sphinx-build -b man -d build/doctrees/man man build/man -c html
}
-package_python2-pip-git() {
- depends=("${_deps[@]/#/python2-}" 'python2-ipaddress')
- conflicts=('python-pyinstall' 'python2-pip')
- replaces=('python-pyinstall')
-
- cd "$srcdir/pip-git"
- 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
+package() {
+ local _site_packages
- install -D -m644 LICENSE.txt \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ cd "${_name}"
+ python -m installer --destdir="$pkgdir" dist/*.whl
- install -Dm644 -t "$pkgdir"/usr/share/man/man1 docs/build/man-pip2/*
+ install -vDm 644 LICENSE.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
+ install -vDm 644 docs/build/man/*.1 -t "$pkgdir/usr/share/man/man1/"
+ install -vDm 644 {NEWS,README}.rst -t "$pkgdir/usr/share/doc/$pkgname/"
+ _site_packages="$(python -c "from distutils import sysconfig; print(sysconfig.get_python_lib())")"
- 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
+ # NOTE: zsh completion does not work: https://bugs.archlinux.org/task/65349#comment187166
+ PYTHONPATH="$pkgdir/$_site_packages" "$pkgdir"/usr/bin/pip completion --bash | install -vDm 644 /dev/stdin "$pkgdir"/usr/share/bash-completion/completions/pip
+ PYTHONPATH="$pkgdir/$_site_packages" "$pkgdir"/usr/bin/pip completion --fish | install -vDm 644 /dev/stdin "$pkgdir"/usr/share/fish/vendor_completions.d/pip.fish
}