update to 2.0.2

package cleaned up according to Python packaging guidelines

2 files changed, 49 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b09e3365c2b..f90858862de5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
-# Generated by mksrcinfo v8
-# Wed Jan 18 10:12:37 UTC 2017
 pkgbase = python-json-delta
-	pkgdesc = A diff/patch pair for JSON-serialized data structures
-	pkgver = 2.0
+	pkgdesc = Diff/patch pair for JSON-serialized data structures
+	pkgver = 2.0.2
 	pkgrel = 1
 	url = https://pypi.python.org/pypi/json-delta/
 	arch = any
 	license = BSD
-	source = https://pypi.python.org/packages/d4/82/b61f5ba5f4e09531a80b1a50c251be01f8bdb4997f9fbad077b7572d5ea0/json_delta-2.0.tar.gz
-	sha256sums = 462a73672f7527517d863930bb442ed1986c35dfb6960e0fb1cb84393deea652
+	makedepends = python-setuptools
+	makedepends = python2-setuptools
+	source = python-json-delta-2.0.2.tar.gz::https://files.pythonhosted.org/packages/source/j/json_delta/json_delta-2.0.2.tar.gz
+	sha256sums = 95ea3ff9908fc7d634c27ffec11db8fd8d935aa3e895d7302915d394b10e0321
 
 pkgname = python-json-delta
 	depends = python
 
 pkgname = python2-json-delta
 	depends = python2
-
diff --git a/PKGBUILD b/PKGBUILD
index 501d25a9737e..e5211f13fb8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,57 @@
-# Maintainer: hexchain <i@hexchain.org>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: hexchain <i@hexchain.org>
 
-_pkgname=json_delta
 pkgbase=python-json-delta
-pkgname=(python-json-delta python2-json-delta)
-license=("BSD")
-pkgver=2.0
+_name=json_delta
+pkgname=('python-json-delta' 'python2-json-delta')
+pkgver=2.0.2
 pkgrel=1
-pkgdesc="A diff/patch pair for JSON-serialized data structures"
-url="https://pypi.python.org/pypi/json-delta/"
-source=("https://pypi.python.org/packages/d4/82/b61f5ba5f4e09531a80b1a50c251be01f8bdb4997f9fbad077b7572d5ea0/json_delta-2.0.tar.gz")
+pkgdesc="Diff/patch pair for JSON-serialized data structures"
+license=('BSD')
 arch=("any")
+url="https://pypi.python.org/pypi/json-delta/"
+makedepends=('python-setuptools' 'python2-setuptools')
+source=("$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz")
+sha256sums=('95ea3ff9908fc7d634c27ffec11db8fd8d935aa3e895d7302915d394b10e0321')
+
+prepare() {
+	cp -a "$_name-$pkgver"{,-py2}
+}
 
 build() {
-    cd "$srcdir"
-    cp -r "$_pkgname-$pkgver" "$_pkgname-$pkgver-py2"
+	cd "$srcdir/$_name-$pkgver"
+	python setup.py build
+
+	cd "$srcdir/$_name-$pkgver-py2"
+	python2 setup.py build
+}
+
+check() {
+	cd "$srcdir/$_name-$pkgver"
+	python setup.py test
+
+	cd "$srcdir/$_name-$pkgver-py2"
+	python2 setup.py test
 }
 
 package_python-json-delta() {
-    depends=("python")
-    cd "$srcdir/$_pkgname-$pkgver"
-    python setup.py install --prefix=/usr --root="$pkgdir" -O1
-    install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
+	depends=('python')
+
+	cd "$_name-$pkgver"
+	PYTHONHASHSEED=0 python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 --skip-build
+	install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
 }
 
 package_python2-json-delta() {
-    depends=("python2")
-    cd "$srcdir/$_pkgname-$pkgver-py2"
-    python2 setup.py install --prefix=/usr --root="$pkgdir" -O1
-    install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
-
-    cd "$pkgdir/usr/bin"
-    for f in *; do
-        mv "$f" "${f}2"
-    done
+	depends=('python2')
+
+	cd "$_name-$pkgver-py2"
+	PYTHONHASHSEED=0 python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 --skip-build
+	install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+
+	cd "$pkgdir/usr/bin"
+	for f in *; do
+		mv "$f" "${f}2"
+	done
 }
 
-sha256sums=('462a73672f7527517d863930bb442ed1986c35dfb6960e0fb1cb84393deea652')