From 8c9653a97331bf26621f64f8824786fd3e22b692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= <45581170+micwoj92@users.noreply.github.com> Date: Thu, 27 Feb 2025 18:41:12 +0100 Subject: [PATCH 1/4] Use python-installer instead of python-pip --- python-pantable-git/.SRCINFO | 14 ++++++++------ python-pantable-git/PKGBUILD | 24 +++++++++++++++--------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/python-pantable-git/.SRCINFO b/python-pantable-git/.SRCINFO index 465f64ae4..b3c43fae3 100644 --- a/python-pantable-git/.SRCINFO +++ b/python-pantable-git/.SRCINFO @@ -1,20 +1,22 @@ pkgbase = python-pantable-git pkgdesc = CSV Tables in Markdown: Pandoc Filter for CSV Tables - pkgver = 0.13.1.r13.g265770e + pkgver = 0.14.2.r21.gba26525 pkgrel = 1 url = https://github.com/ickc/pantable arch = any license = GPL3 makedepends = git - makedepends = python-pip - depends = pandoc>=2.11.2 + makedepends = python-build + makedepends = python-poetry-core + makedepends = python-installer + depends = pandoc depends = python - depends = python-panflute>=2 + depends = python-panflute + depends = python-numpy depends = python-yaml - provides = python-pantable=0.13.1.r13.g265770e + provides = python-pantable=0.14.2.r21.gba26525 conflicts = python-pantable source = python-pantable-git::git+https://github.com/ickc/pantable.git sha256sums = SKIP pkgname = python-pantable-git - diff --git a/python-pantable-git/PKGBUILD b/python-pantable-git/PKGBUILD index cb2b53991..dfbfbb1e3 100644 --- a/python-pantable-git/PKGBUILD +++ b/python-pantable-git/PKGBUILD @@ -2,19 +2,22 @@ _name=pantable pkgname=python-$_name-git -pkgver=0.13.1.r13.g265770e +pkgver=0.14.2.r21.gba26525 pkgrel=1 pkgdesc='CSV Tables in Markdown: Pandoc Filter for CSV Tables' arch=('any') url="https://github.com/ickc/$_name" license=('GPL3') -_py_deps=('panflute>=2' - 'yaml') -depends=('pandoc>=2.11.2' - 'python' - "${_py_deps[@]/#/python-}") +_pydeps=(panflute + numpy + yaml) +depends=(pandoc + python + "${_pydeps[@]/#/python-}") makedepends=('git' - 'python-pip') + 'python-build' + 'python-poetry-core' + 'python-installer') provides=("${pkgname%-git}=$pkgver") conflicts=("${pkgname%-git}") source=("$pkgname::git+$url.git") @@ -25,8 +28,11 @@ pkgver() { git describe --long --tags --abbrev=7 HEAD | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } - +build() { + cd "${pkgname}" + python -m build -wn +} package() { cd "${pkgname}" - pip install --isolated --root="$pkgdir" --ignore-installed --no-deps . + python -m installer -d "$pkgdir" dist/*.whl } From 7ad909c84fee3f24046dd646359b975de0443f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= <45581170+micwoj92@users.noreply.github.com> Date: Thu, 27 Feb 2025 18:42:25 +0100 Subject: [PATCH 2/4] Remove unneeded PIP_CONFIG_FILE variable --- python-skia-pathops/PKGBUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/python-skia-pathops/PKGBUILD b/python-skia-pathops/PKGBUILD index b989a8175..9665014d9 100644 --- a/python-skia-pathops/PKGBUILD +++ b/python-skia-pathops/PKGBUILD @@ -24,7 +24,6 @@ sha256sums=('7db6b12d5cd85d0dec27f8f4ff41f8e2befa76a40170cda9715f98d2002d0da1') # Drop a comment on the AUR page if you have ideas. package() { - export PIP_CONFIG_FILE=/dev/null python -m installer --destdir="$pkgdir" $_wheel python -O -m compileall "$pkgdir" } From 90e60bfe0c680d86a17d8a2ccbb4e77adc57002b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= <45581170+micwoj92@users.noreply.github.com> Date: Thu, 27 Feb 2025 18:45:13 +0100 Subject: [PATCH 3/4] Bump to 134.0b12, stable release had no py313 whl Use python-installer instead of python-pip --- python-skia/.SRCINFO | 8 ++++---- python-skia/PKGBUILD | 13 ++++++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/python-skia/.SRCINFO b/python-skia/.SRCINFO index 708522838..822ca7880 100644 --- a/python-skia/.SRCINFO +++ b/python-skia/.SRCINFO @@ -1,16 +1,16 @@ pkgbase = python-skia pkgdesc = Python binding to Skia Graphics Library (wheel) - pkgver = 87.6 + pkgver = 134.0b12 pkgrel = 1 url = https://github.com/kyamagu/skia-python arch = x86_64 license = BSD-3-Clause - makedepends = python-pip + makedepends = python-installer depends = fontconfig depends = opengl-driver depends = python options = !strip - source = https://files.pythonhosted.org/packages/cp312/s/skia-python/skia_python-87.6-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - sha256sums = b4797d81f053c9147e8c5006192083ad265d17f5f093b9bac5f0f0c166a78c0c + source = https://files.pythonhosted.org/packages/cp313/s/skia-python/skia_python-134.0b12-cp313-cp313-manylinux_2_28_x86_64.whl + sha256sums = b7a6bf4f3cd458159f7d9c69a9473e70ceba0622ab9eb44333119413fd599ed8 pkgname = python-skia diff --git a/python-skia/PKGBUILD b/python-skia/PKGBUILD index 6da5c21d4..b1c734c03 100644 --- a/python-skia/PKGBUILD +++ b/python-skia/PKGBUILD @@ -3,19 +3,19 @@ pkgname=python-skia _pkgname=skia-python -pkgver=87.6 +pkgver=134.0b12 pkgrel=1 pkgdesc='Python binding to Skia Graphics Library (wheel)' arch=(x86_64) url="https://github.com/kyamagu/$_pkgname" license=(BSD-3-Clause) depends=(fontconfig opengl-driver python) -makedepends=(python-pip) +makedepends=(python-installer) options=(!strip) -_py=cp312 -_wheel="${_pkgname/-/_}-$pkgver-$_py-$_py-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" +_py=cp313 +_wheel="${_pkgname/-/_}-$pkgver-$_py-$_py-manylinux_2_28_x86_64.whl" source=("https://files.pythonhosted.org/packages/$_py/${_pkgname::1}/$_pkgname/$_wheel") -sha256sums=('b4797d81f053c9147e8c5006192083ad265d17f5f093b9bac5f0f0c166a78c0c') +sha256sums=('b7a6bf4f3cd458159f7d9c69a9473e70ceba0622ab9eb44333119413fd599ed8') # If anybody wants to muck around with the Chromium tree and figure out how to # build skia from source on Arch I'm open to patches, but even after mucking @@ -24,7 +24,6 @@ sha256sums=('b4797d81f053c9147e8c5006192083ad265d17f5f093b9bac5f0f0c166a78c0c') # the AUR page if you have ideas. package() { - export PIP_CONFIG_FILE=/dev/null - pip install --isolated --root="$pkgdir" --ignore-installed --no-deps $_wheel + python -m installer --destdir="$pkgdir" $_wheel python -O -m compileall "$pkgdir" } From 54d28d3bb0871e11ca5ef056460f00a3be652b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= <45581170+micwoj92@users.noreply.github.com> Date: Thu, 27 Feb 2025 18:45:56 +0100 Subject: [PATCH 4/4] Use python-installer instead of python-pip --- python-ttfautohint-py/.SRCINFO | 5 +++-- python-ttfautohint-py/PKGBUILD | 9 ++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/python-ttfautohint-py/.SRCINFO b/python-ttfautohint-py/.SRCINFO index 2249131c6..5cf5e8970 100644 --- a/python-ttfautohint-py/.SRCINFO +++ b/python-ttfautohint-py/.SRCINFO @@ -1,12 +1,13 @@ pkgbase = python-ttfautohint-py pkgdesc = Python wrapper for ttfautohint, a free auto-hinter for TrueType fonts pkgver = 0.5.1 - pkgrel = 3 + pkgrel = 4 url = https://github.com/fonttools/ttfautohint-py arch = x86_64 license = MIT - makedepends = python-pip + makedepends = python-installer depends = python + depends = python-setuptools source = https://files.pythonhosted.org/packages/py2.py3/t/ttfautohint-py/ttfautohint_py-0.5.1-py2.py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sha256sums = 5c65fe2fd3ee16d68201169c72413e70130d9f9d0b92589f9122d9f72a98d093 diff --git a/python-ttfautohint-py/PKGBUILD b/python-ttfautohint-py/PKGBUILD index 469fb2fee..a0abe7b5a 100644 --- a/python-ttfautohint-py/PKGBUILD +++ b/python-ttfautohint-py/PKGBUILD @@ -3,20 +3,19 @@ _pyname=ttfautohint-py pkgname=python-$_pyname pkgver=0.5.1 -pkgrel=3 +pkgrel=4 pkgdesc='Python wrapper for ttfautohint, a free auto-hinter for TrueType fonts' url="https://github.com/fonttools/$_pyname" arch=(x86_64) license=(MIT) -depends=(python) -makedepends=(python-pip) +depends=(python python-setuptools) +makedepends=(python-installer) _py=py2.py3 _wheel="${_pyname/-/_}-$pkgver-$_py-none-manylinux_2_17_$CARCH.manylinux2014_$CARCH.whl" source=("https://files.pythonhosted.org/packages/$_py/${_pyname::1}/$_pyname/$_wheel") sha256sums=('5c65fe2fd3ee16d68201169c72413e70130d9f9d0b92589f9122d9f72a98d093') package() { - export PIP_CONFIG_FILE=/dev/null - pip install --isolated --root="$pkgdir" --ignore-installed --no-deps $_wheel + python -m installer --destdir="$pkgdir" $_wheel python -O -m compileall "$pkgdir" }