package cleanup

2 files changed, 33 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 956f1766b45d..9d150368bd5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,17 @@
 pkgbase = python-mglib
 	pkgdesc = Python Package containing modules shared across all Papermerge Project project
 	pkgver = 1.3.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/papermerge/mglib
 	arch = any
 	license = Apache
+	checkdepends = python-magic
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-setuptools
+	makedepends = python-wheel
 	depends = python
-	source = python-mglib-1.3.1.src.tar.gz::https://github.com/papermerge/mglib/archive/v1.3.1.tar.gz
+	source = python-mglib-1.3.1.tar.gz::https://github.com/papermerge/mglib/archive/v1.3.1.tar.gz
 	sha256sums = 18c81f63a4d9709f2a3c29afa48a83ac91f5eea2f13f0535d58445cd738be6f0
 
 pkgname = python-mglib
diff --git a/PKGBUILD b/PKGBUILD
index b7ce6a1baaf3..44fe67d9862c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,45 @@
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
 # Contributor: Lucki <https://aur.archlinux.org/account/Lucki>
+# Contributor: amo <https://aur.archlinux.org/account/amo>
 # shellcheck disable=SC2034,2154,2148
-# Maintainer: amo <https://aur.archlinux.org/account/amo>
 
 pkgname=python-mglib
-_pkgname=mglib
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Python Package containing modules shared across all Papermerge Project project"
 arch=('any')
 url="https://github.com/papermerge/mglib"
 license=('Apache')
 depends=('python')
-makedepends=('python-setuptools')
-source=("$pkgname-$pkgver.src.tar.gz::https://github.com/papermerge/mglib/archive/v$pkgver.tar.gz")
+makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+# checkdepends=('python-magic')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
 sha256sums=('18c81f63a4d9709f2a3c29afa48a83ac91f5eea2f13f0535d58445cd738be6f0')
 
+prepare() {
+	cd "mglib-$pkgver"
+	sed -i '/packages=/s/()/(exclude=["*tests*"])/' setup.py
+}
+
 build() {
-  cd "$_pkgname-$pkgver" || exit
-  python setup.py build
+	cd "mglib-$pkgver"
+	python -m build --wheel --no-isolation
 }
 
+## FIXME: tests fail due to breaking changes in python-magic
+# check() {
+# 	cd "mglib-$pkgver"
+# 	PYTHONPATH="$PWD" python test/run.py
+# }
+
 package() {
-  cd "$_pkgname-$pkgver" || exit
+	export PYTHONHASHSEED=0
+	cd "mglib-$pkgver"
+	python -m installer --destdir="$pkgdir/" dist/*.whl
 
-  export PYTHONHASHSEED=0
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+	local _site="$(python -c 'import site; print(site.getsitepackages()[0])')"
+	install -d "$pkgdir/usr/share/licenses/$pkgname/"
+	ln -s \
+		"$_site/mglib-$pkgver.dist-info/LICENSE" \
+		"$pkgdir/usr/share/licenses/$pkgname/"
 }