Bump to 0.8.0

3 files changed, 34 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1f189bd2b80..834975c98bdf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,23 @@
 pkgbase = apio
 	pkgdesc = Experimental micro-ecosystem for open FPGAs
-	pkgver = 0.7.6
+	pkgver = 0.8.0
 	pkgrel = 1
 	url = https://pypi.org/project/apio/
 	arch = any
 	license = GPL
-	makedepends = python-setuptools
+	checkdepends = python-pytest
+	makedepends = python-build
+	makedepends = python-flit
+	makedepends = python-install
 	depends = python-click
 	depends = python-pyserial
 	depends = python-semantic-version
-	depends = python-pyjwt
 	depends = python-colorama
 	depends = python-requests
 	depends = sudo
 	depends = python-wheel
-	source = https://files.pythonhosted.org/packages/source/a/apio/apio-0.7.6.tar.gz
-	sha256sums = f7cffcc05cef0c3442094efb17ecd472bc946eb77f7265777dcf88ab51d7e07f
+	depends = scons
+	source = https://files.pythonhosted.org/packages/source/a/apio/apio-0.8.0.tar.gz
+	sha256sums = 6a5b841c7a9259a1aa4e5533f8288c58b388714c362f15399b17f18b394fea99
 
 pkgname = apio
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..2e38d96a13c2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+pkg/
+src/
+*.tar.gz
+*.tar.zst
diff --git a/PKGBUILD b/PKGBUILD
index 95a02591e847..9733ce8b7ce0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,39 @@
 pkgname=apio
 _name=apio
-pkgver=0.7.6
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="Experimental micro-ecosystem for open FPGAs"
 arch=('any')
 url="https://pypi.org/project/apio/"
 license=('GPL')
 depends=('python-click' 'python-pyserial' 'python-semantic-version'
-         'python-pyjwt' 'python-colorama' 'python-requests' 'sudo' 'python-wheel')
-makedepends=('python-setuptools')
+         'python-colorama' 'python-requests' 'sudo'
+         'python-wheel' 'scons')
+makedepends=('python-build' 'python-flit' 'python-install')
+checkdepends=('python-pytest')
 source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz")
-sha256sums=('f7cffcc05cef0c3442094efb17ecd472bc946eb77f7265777dcf88ab51d7e07f')
+sha256sums=('6a5b841c7a9259a1aa4e5533f8288c58b388714c362f15399b17f18b394fea99')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd "${_name}-$pkgver"
 
-  sed -i 's/from distutils.core import setup/from setuptools import setup/g' ./setup.py
-  python setup.py build
+  python -m build --wheel --skip-dependency-check --no-isolation
+}
+
+check() {
+  cd "${_name}-$pkgver"
+
+  # We need a venv since apio.commands.upgrade requests the installed apio package version
+  python -m venv --system-site-packages test-venv
+  ./test-venv/bin/python -m install dist/*.whl
+
+  ./test-venv/bin/python -m pytest -v -c /dev/null test
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd "${_name}-$pkgver"
+
+  python -m install --optimize=1 --destdir="$pkgdir" dist/*.whl
 
-  python setup.py install --root="$pkgdir"/  --optimize=1
+  chmod +x $pkgdir/usr/bin/apio
 }