packaging update

2 files changed, 38 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 22e5741e4985..7dee97361836 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,26 @@
 pkgbase = python-imagededup
 	pkgdesc = Finding duplicate images made easy
 	pkgver = 0.2.4
-	pkgrel = 1
-	url = https://idealo.github.io/imagededup
+	pkgrel = 2
+	url = https://github.com/idealo/imagededup
 	arch = x86_64
 	license = Apache
-	makedepends = python-setuptools
+	checkdepends = python-pytest
+	checkdepends = python-pytest-mock
 	makedepends = cython
-	depends = python
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-setuptools
+	makedepends = python-wheel
+	depends = python-matplotlib
 	depends = python-numpy
 	depends = python-pillow
+	depends = python-pywavelets
+	depends = python-scikit-learn
 	depends = python-scipy
 	depends = python-tensorflow
 	depends = python-tqdm
-	depends = python-scikit-learn
-	depends = python-matplotlib
-	depends = python-pywavelets
 	source = python-imagededup-0.2.4.tar.gz::https://github.com/idealo/imagededup/archive/v0.2.4.tar.gz
 	sha256sums = ec8b4d5bd23b50fdf12e3dea5eb680b6852cea13fea3a3ec506098ea91b54c24
 
 pkgname = python-imagededup
-
diff --git a/PKGBUILD b/PKGBUILD
index ae57ff92633f..e6edc9299e2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,41 @@
-# Maintainer: Dimitris Kiziridis <ragouel at outlook dot com>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: Dimitris Kiziridis <ragouel at outlook dot com>
 
 pkgname=python-imagededup
+_pkg="${pkgname#python-}"
 pkgver=0.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Finding duplicate images made easy'
 arch=('x86_64')
-url='https://idealo.github.io/imagededup'
+url='https://github.com/idealo/imagededup'
 license=('Apache')
-depends=('python'
-         'python-numpy'
-         'python-pillow'
-         'python-scipy'
-         'python-tensorflow'
-         'python-tqdm'
-         'python-scikit-learn'
-         'python-matplotlib'
-         'python-pywavelets')
-makedepends=('python-setuptools' 'cython')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/idealo/imagededup/archive/v${pkgver}.tar.gz")
+depends=(
+  'python-matplotlib'
+  'python-numpy'
+  'python-pillow'
+  'python-pywavelets'
+  'python-scikit-learn'
+  'python-scipy'
+  'python-tensorflow'
+  'python-tqdm')
+makedepends=('cython' 'python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+checkdepends=('python-pytest' 'python-pytest-mock')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
 sha256sums=('ec8b4d5bd23b50fdf12e3dea5eb680b6852cea13fea3a3ec506098ea91b54c24')
 
 build() {
-  cd "imagededup-${pkgver}"
-  python setup.py build
+  cd "$_pkg-$pkgver"
+  python -m build --wheel --no-isolation
+}
+
+check() {
+  cd "$_pkg-$pkgver"
+  local _py="$(python -c 'import sys; print("".join(map(str, sys.version_info[:2])))')"
+  PYTHONPATH="$PWD/build/lib.linux-$CARCH-cpython-$_py" pytest -x --disable-warnings
 }
 
 package() {
-  cd "imagededup-${pkgver}"
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  cd "$_pkg-$pkgver"
+  PYTHONHASHSEED=0 python -m installer --destdir="$pkgdir" dist/*.whl
 }
 # vim:set ts=2 sw=2 et: