From cd79d7e10d166a0b12060796df2b2a29bf10ac4c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 27 Jul 2022 17:41:58 +0200 Subject: [PATCH 1/2] pip: port to build/installer --- python-pip/PKGBUILD | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/python-pip/PKGBUILD b/python-pip/PKGBUILD index 65d51617..0b50ca52 100644 --- a/python-pip/PKGBUILD +++ b/python-pip/PKGBUILD @@ -4,13 +4,20 @@ _realname=pip pkgbase="python-${_realname}" pkgname=("python-${_realname}") pkgver=21.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="The PyPA recommended tool for installing Python packages" url="https://pip.pypa.io/" arch=('any') license=('MIT') -depends=('python' 'python-setuptools') -makedepends=('python' 'python-setuptools') +depends=( + 'python' + 'python-setuptools' +) +makedepends=( + 'python-build' + 'python-installer' + 'python-wheel' +) provides=("python3-${_realname}") replaces=("python3-${_realname}") conflicts=("python3-${_realname}") @@ -19,12 +26,13 @@ sha256sums=('5210d413c7f79cb46551a8ebbc3ae450e7da55ea73849cfc9687d132c0ae1092') build() { cd "${srcdir}/${_realname}-${pkgver}" - python setup.py build + + python -m build --wheel --skip-dependency-check --no-isolation } package() { cd "${srcdir}/${_realname}-${pkgver}" - python setup.py install --prefix=/usr --root="${pkgdir}" + python -m installer --destdir="${pkgdir}" dist/*.whl install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } From fbbc953e5920b7fb0e72152ba5e910245cea1eef Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 27 Jul 2022 17:45:06 +0200 Subject: [PATCH 2/2] pip: Update to 22.2 --- python-pip/PKGBUILD | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/python-pip/PKGBUILD b/python-pip/PKGBUILD index 0b50ca52..fdde2fe1 100644 --- a/python-pip/PKGBUILD +++ b/python-pip/PKGBUILD @@ -3,12 +3,12 @@ _realname=pip pkgbase="python-${_realname}" pkgname=("python-${_realname}") -pkgver=21.1.1 -pkgrel=3 +pkgver=22.2 +pkgrel=1 pkgdesc="The PyPA recommended tool for installing Python packages" url="https://pip.pypa.io/" arch=('any') -license=('MIT') +license=('spdx:MIT') depends=( 'python' 'python-setuptools' @@ -22,7 +22,7 @@ provides=("python3-${_realname}") replaces=("python3-${_realname}") conflicts=("python3-${_realname}") source=(${_realname}-${pkgver}.tar.gz::https://github.com/pypa/${_realname}/archive/${pkgver}.tar.gz) -sha256sums=('5210d413c7f79cb46551a8ebbc3ae450e7da55ea73849cfc9687d132c0ae1092') +sha256sums=('29f3b99409e8d633167df8c71262675ff7698b9831de45aa17d9221ed97028b6') build() { cd "${srcdir}/${_realname}-${pkgver}" @@ -34,5 +34,7 @@ package() { cd "${srcdir}/${_realname}-${pkgver}" python -m installer --destdir="${pkgdir}" dist/*.whl + rm "${pkgdir}"/usr/lib/python*/site-packages/pip/_vendor/distlib/*.exe + install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" }