theharvester-git: follow PEP 517; remove broken test

2 files changed, 38 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b32252a26872..4e83b1e9b2cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = theharvester-git
 	pkgdesc = Gather emails, names, subdomains, IPs and URLs related to targets using public sources
-	pkgver = 4.2.0.r254.g5065d6c
+	pkgver = 4.2.0.r304.gd09392b
 	pkgrel = 1
 	url = https://github.com/laramies/theHarvester
 	install = theHarvester.install
@@ -8,13 +8,15 @@ pkgbase = theharvester-git
 	license = GPL2
 	checkdepends = python-pytest
 	makedepends = git
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-wheel
 	makedepends = python-setuptools
 	depends = python-aiodns
 	depends = python-aiofiles
 	depends = python-aiohttp
 	depends = python-aiomultiprocess
 	depends = python-aiosqlite
-	depends = python-argparse
 	depends = python-beautifulsoup4
 	depends = python-censys
 	depends = python-certifi
diff --git a/PKGBUILD b/PKGBUILD
index e9e5740cf0a0..2def0469b881 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,36 @@
 # Maintainer: éclairevoyant
 
 pkgname=theharvester-git
-pkgver=4.2.0.r254.g5065d6c
+pkgver=4.2.0.r304.gd09392b
 pkgrel=1
 pkgdesc="Gather emails, names, subdomains, IPs and URLs related to targets using public sources"
-arch=('any')
+arch=(any)
 url="https://github.com/laramies/theHarvester"
-license=('GPL2')
+license=(GPL2)
 depends=(
-	'python-aiodns'
-	'python-aiofiles'
-	'python-aiohttp'
-	'python-aiomultiprocess'
-	'python-aiosqlite'
-	'python-argparse'
-	'python-beautifulsoup4'
-	'python-censys'
-	'python-certifi'
-	'python-dnspython'
-	'python-fastapi'
-	'python-lxml'
-	'python-netaddr'
-	'python-ujson'
-	'python-pyppeteer'
-	'python-yaml'
-	'python-requests'
-	'python-retrying'
-	'python-shodan'
-	'uvicorn'
-	'python-uvloop'
+	python-aiodns
+	python-aiofiles
+	python-aiohttp
+	python-aiomultiprocess
+	python-aiosqlite
+	python-beautifulsoup4
+	python-censys
+	python-certifi
+	python-dnspython
+	python-fastapi
+	python-lxml
+	python-netaddr
+	python-ujson
+	python-pyppeteer
+	python-yaml
+	python-requests
+	python-retrying
+	python-shodan
+	uvicorn
+	python-uvloop
 )
-makedepends=('git' 'python-setuptools')
-checkdepends=('python-pytest')
+makedepends=(git python-{build,installer,wheel} python-setuptools)
+checkdepends=(python-pytest)
 install="theHarvester.install"
 source=("$pkgname::git+$url.git")
 b2sums=('SKIP')
@@ -41,17 +40,23 @@ pkgver() {
 	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+	# see laramies/theHarvester#1390
+	rm $pkgname/tests/discovery/test_qwantsearch.py
+}
+
 build() {
 	cd $pkgname
-	python setup.py build
+	python -m build -wn
 }
 
 check() {
 	cd $pkgname
-	pytest
+	export PYTHONPATH="$PWD/build/lib"
+	python -m unittest discover
 }
 
 package() {
 	cd $pkgname
-	python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+	python -m installer -d "$pkgdir" dist/*.whl
 }