packaging update

2 files changed, 29 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5e67c2128f4..06c9e78b4f64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = python-milksnake
 	pkgdesc = Distribute dynamic linked libraries in Python wheels
 	pkgver = 0.1.5.r3.gef0723e
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/getsentry/milksnake
 	arch = any
 	license = Apache
 	checkdepends = cargo
 	checkdepends = python-pytest
 	checkdepends = python-virtualenv
-	makedepends = git
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-setuptools
+	makedepends = python-wheel
 	depends = python-cffi
-	source = git+https://github.com/getsentry/milksnake#commit=ef0723e41df23d8f6357570c69c1e69cb31f9e9e
+	source = python-milksnake-0.1.5.r3.gef0723e.tar.gz::https://github.com/getsentry/milksnake/archive/ef0723e41df23d8f6357570c69c1e69cb31f9e9e.tar.gz
 	source = python-milksnake-0.1.5-distutils.patch
-	sha512sums = SKIP
-	sha512sums = cee83c569881b0c30a31397b43997db6fd32518f34c871714eea0b722ebf974e550c0c40b6bfe3ab7e1dfaddee2d4fbaae31551f51d776337b38a7a26821814d
-	b2sums = SKIP
-	b2sums = 9c4abaf5623ee3ff2fe15e0f90afe94b9e1a46cfa45d73bb3ee0abd59acd7e030cc1123a3da77f917cbd91ba96bdc278bda8223ac4c7f4c6fb249da3d369937c
+	sha256sums = 42b89da523e0c530b3b9744dcd660adce3ff4a5dd4b11121a59c53ce992a76cc
+	sha256sums = 3de5520219bc857aa20a38af0eaf2562eb646b1445889ed6b2379f89d46ad1a6
 
 pkgname = python-milksnake
diff --git a/PKGBUILD b/PKGBUILD
index de31a35390b3..ef2ffd50b8ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,42 @@
-# Maintainer: David Runge <dvzrv@archlinux.org>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: David Runge <dvzrv@archlinux.org>
 
-_name=milksnake
 pkgname=python-milksnake
+_pkg="${pkgname#python-}" # milkshake
 # we pin to current HEAD, because upstream is abandonware:
 # https://github.com/getsentry/milksnake/issues/28
 _commit=ef0723e41df23d8f6357570c69c1e69cb31f9e9e
 pkgver=0.1.5.r3.gef0723e
-pkgrel=1
+_pkgver="${pkgver%.r*}"
+pkgrel=2
 pkgdesc="Distribute dynamic linked libraries in Python wheels"
-arch=(any)
+arch=('any')
 url="https://github.com/getsentry/milksnake"
-license=(Apache)
-depends=(python-cffi)
-makedepends=(git python-setuptools)
-checkdepends=(cargo python-pytest python-virtualenv)
-source=(
-  "git+https://github.com/getsentry/$_name#commit=$_commit"
-  "${pkgname}-0.1.5-distutils.patch"
-)
-sha512sums=('SKIP'
-            'cee83c569881b0c30a31397b43997db6fd32518f34c871714eea0b722ebf974e550c0c40b6bfe3ab7e1dfaddee2d4fbaae31551f51d776337b38a7a26821814d')
-b2sums=('SKIP'
-        '9c4abaf5623ee3ff2fe15e0f90afe94b9e1a46cfa45d73bb3ee0abd59acd7e030cc1123a3da77f917cbd91ba96bdc278bda8223ac4c7f4c6fb249da3d369937c')
-
-pkgver() {
-  cd "$_name"
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
+license=('Apache')
+depends=('python-cffi')
+makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+checkdepends=('cargo' 'python-pytest' 'python-virtualenv')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$_commit.tar.gz"
+        "$pkgname-0.1.5-distutils.patch")
+sha256sums=('42b89da523e0c530b3b9744dcd660adce3ff4a5dd4b11121a59c53ce992a76cc'
+            '3de5520219bc857aa20a38af0eaf2562eb646b1445889ed6b2379f89d46ad1a6')
 
 prepare() {
-  cd "$_name"
-  # improve distutils build command: https://github.com/getsentry/milksnake/pull/30
-  patch -Np1 -i ../${pkgname}-0.1.5-distutils.patch
+	# improve distutils build command: https://github.com/getsentry/milksnake/pull/30
+	patch -Np1 -d "$_pkg-$_commit" < "$pkgname-$_pkgver-distutils.patch"
 }
 
 build() {
-  cd "$_name"
-  python setup.py build
+	cd "$_pkg-$_commit"
+	python -m build --wheel --no-isolation
 }
 
 check() {
-  cd "$_name"
-  export PYTHONPATH="build:$PYTHONPATH"
-  pytest -v -c /dev/null
+	cd "$_pkg-$_commit"
+	PYTHONPATH="build:$PYTHONPATH" pytest -v -c /dev/null
 }
 
 package() {
-  cd "$_name"
-  python setup.py install --optimize=1 --root="$pkgdir"
-  install -vDm 644 README.md -t "$pkgdir/usr/share/doc/$pkgname"
-  install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
+	cd "$_pkg-$_commit"
+	python -m installer --destdir "$pkgdir" dist/*.whl
 }