packaging cleanup

2 files changed, 34 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5834300227f..221598f377b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,17 @@
 pkgbase = python-nanoid
 	pkgdesc = A tiny, secure, URL-friendly, unique string ID generator for Python
 	pkgver = 2.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/puyuan/py-nanoid
 	arch = any
 	license = MIT
+	checkdepends = python-pytest
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-setuptools
+	makedepends = python-wheel
 	depends = python
-	source = https://pypi.org/packages/source/n/nanoid/nanoid-2.0.0.tar.gz
-	sha512sums = 7db65075357feb19c4747be9abca1a19a2b8583f82cdcae87f06846141d798a725128ee784ce33cd3b14b272c0beb2dcac0faf4536e8d5183eaa06eab79fff87
+	source = python-nanoid-2.0.0.tar.gz::https://github.com/puyuan/py-nanoid/archive/99e5b478c450f42d713b6111175886dccf16f156.tar.gz
+	sha256sums = 875d3ddbb00359e408110b0e2ee98183ccdd942d6277576b4b528f02d3279cf5
 
 pkgname = python-nanoid
diff --git a/PKGBUILD b/PKGBUILD
index ba495d9b71a4..bd55ef9481c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,35 @@
-# Maintainer: Carlos Aznarán <caznaranl@uni.pe>
-_base=nanoid
-pkgname=python-${_base}
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: Carlos Aznarán <caznaranl@uni.pe>
+
+pkgname=python-nanoid
+_pkg=py-nanoid
 pkgdesc="A tiny, secure, URL-friendly, unique string ID generator for Python"
 pkgver=2.0.0
-pkgrel=1
-arch=(any)
-url="https://github.com/puyuan/py-${_base}"
-license=(MIT)
-depends=(python)
-makedepends=(python-setuptools)
-source=(https://pypi.org/packages/source/${_base::1}/${_base}/${_base}-${pkgver}.tar.gz)
-sha512sums=('7db65075357feb19c4747be9abca1a19a2b8583f82cdcae87f06846141d798a725128ee784ce33cd3b14b272c0beb2dcac0faf4536e8d5183eaa06eab79fff87')
+pkgrel=2
+_commit='99e5b478c450f42d713b6111175886dccf16f156'
+arch=('any')
+url="https://github.com/puyuan/py-nanoid"
+license=('MIT')
+depends=('python')
+makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+checkdepends=('python-pytest')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$_commit.tar.gz")
+sha256sums=('875d3ddbb00359e408110b0e2ee98183ccdd942d6277576b4b528f02d3279cf5')
 
 build() {
-  cd ${_base}-${pkgver}
-  python setup.py build
+	cd "$_pkg-$_commit"
+	python -m build --wheel --no-isolation
+}
+
+check() {
+	cd "$_pkg-$_commit"
+	pytest -x
 }
 
 package() {
-  cd ${_base}-${pkgver}
-  PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+	cd "$_pkg-$_commit"
+	python -m installer --destdir "$pkgdir" dist/*.whl
+	local _site="$(python -c 'import site; print(site.getsitepackages()[0])')"
+	install -dv "$pkgdir/usr/share/licenses/$pkgname/"
+	ln -sv "$_site/nanoid-$pkgver.dist-info/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/"
 }