update to 0.2.1

2 files changed, 31 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7aa24df6ce80..6c3a0ea0d351 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,19 @@
 pkgbase = python-spython
 	pkgdesc = CLI tool for working with Singularity Python
-	pkgver = 0.1.17
+	pkgver = 0.2.1
 	pkgrel = 1
-	url = https://singularityhub.github.io/singularity-cli/
+	url = https://github.com/singularityhub/singularity-cli
 	arch = any
 	license = MPL2
-	makedepends = python-setuptools
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-pytest-runner
+	makedepends = python-setuptools
+	makedepends = python-wheel
 	depends = python-requests
 	depends = python-semver
-	optdepends = singularity-container: to use and manipulate Singularity Containers
-	source = python-spython-0.1.17.tar.gz::https://files.pythonhosted.org/packages/source/s/spython/spython-0.1.17.tar.gz
-	sha256sums = 00991fa848c6787ffbb7dfa6efc67cc80cb5214b5faf7124515c92f4bb02de3e
+	optdepends = singularity-container: use and manipulate Singularity Containers
+	source = python-spython-0.2.1.tar.gz::https://files.pythonhosted.org/packages/source/s/spython/spython-0.2.1.tar.gz
+	sha256sums = beb8866751268ebbc38e05ee7d14d99a144f2a9b21409b16e3bcab9ebd452a19
 
 pkgname = python-spython
diff --git a/PKGBUILD b/PKGBUILD
index 2d5ffd6b577c..6bedcfaf60e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,37 @@
 # Contributor: Hans-Nikolai Viessmann <hans AT viess.mn>
 
 pkgname=python-spython
-pkgver=0.1.17
+_pkg="${pkgname#python-}"
+pkgver=0.2.1
 pkgrel=1
 pkgdesc="CLI tool for working with Singularity Python"
 arch=('any')
-url="https://singularityhub.github.io/singularity-cli/"
+url='https://github.com/singularityhub/singularity-cli'
 license=('MPL2')
 depends=('python-requests' 'python-semver')
-optdepends=('singularity-container: to use and manipulate Singularity Containers')
-makedepends=('python-setuptools' 'python-pytest-runner')
-source=("$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/s/spython/spython-$pkgver.tar.gz")
-sha256sums=('00991fa848c6787ffbb7dfa6efc67cc80cb5214b5faf7124515c92f4bb02de3e')
+optdepends=('singularity-container: use and manipulate Singularity Containers')
+makedepends=('python-build' 'python-installer' 'python-pytest-runner' 'python-setuptools' 'python-wheel')
+source=("$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/s/$_pkg/$_pkg-$pkgver.tar.gz")
+sha256sums=('beb8866751268ebbc38e05ee7d14d99a144f2a9b21409b16e3bcab9ebd452a19')
 
-build() {
-	cd "spython-$pkgver"
-	python setup.py build
+prepare() {
+	cd "$_pkg-$pkgver"
+	rm -rf "$_pkg.egg-info"
+	sed -i '/spython/d' MANIFEST.in
+	sed -i '/find_packages/s/()/(exclude=["*tests*"])/' setup.py
 }
 
-check() {
-	cd "spython-$pkgver"
-	python setup.py pytest
+build() {
+	cd "$_pkg-$pkgver"
+	python -m build --wheel --no-isolation
 }
 
+# check() {
+# 	cd "$_pkg-$pkgver"
+# 	python setup.py pytest
+# }
+
 package() {
-	cd "spython-$pkgver"
-	PYTHONHASHSEED=0 python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+	cd "$_pkg-$pkgver"
+	PYTHONHASHSEED=0 python -m installer --destdir="$pkgdir" dist/*.whl
 }