upgpkg: python-pygtrie 2.3.3-2

Adopt, overhaul, fix deps, add check

2 files changed, 25 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1a1eb479834a..c139b8817cd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,13 @@
 pkgbase = python-pygtrie
 	pkgdesc = Python library implementing a trie data structure
 	pkgver = 2.3.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/google/pygtrie
 	arch = any
 	license = Apache
-	source = https://pypi.io/packages/source/p/pygtrie/pygtrie-2.3.3.tar.gz
-	source = LICENSE
+	makedepends = python-setuptools
+	depends = python
+	source = https://files.pythonhosted.org/packages/source/p/pygtrie/pygtrie-2.3.3.tar.gz
 	sha256sums = 2204dbd95584f67821da5b3771c4305ac5585552b3230b210f1f05322608db2c
-	sha256sums = cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30
 
 pkgname = python-pygtrie
-	depends = python
-	depends = python-setuptools
-
-pkgname = python2-pygtrie
-	depends = python2
-	depends = python2-setuptools
-
diff --git a/PKGBUILD b/PKGBUILD
index 18f32627e676..900caf38e546 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,31 @@
-# Maintainer: Boyan Ding <boyan.j.ding@gmail.com>
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
+# Contributor: Boyan Ding <boyan.j.ding@gmail.com>
 
-pkgbase=python-pygtrie
-pkgname=('python-pygtrie' 'python2-pygtrie')
+_pyname=pygtrie
+pkgname=python-$_pyname
 pkgver=2.3.3
-pkgrel=1
-pkgdesc="Python library implementing a trie data structure"
+pkgrel=2
+pkgdesc='Python library implementing a trie data structure'
 arch=(any)
-url="https://github.com/google/pygtrie"
-license=('Apache')
-source=(
-  "https://pypi.io/packages/source/p/pygtrie/pygtrie-${pkgver}.tar.gz"
-  LICENSE
-)
-sha256sums=(
-  '2204dbd95584f67821da5b3771c4305ac5585552b3230b210f1f05322608db2c'
-  'cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30'
-)
-
-prepare() {
-  cp -a pygtrie-$pkgver{,-py2}
-}
+url="https://github.com/google/$_pyname"
+license=(Apache)
+depends=(python)
+makedepends=(python-setuptools)
+_archive="$_pyname-$pkgver"
+source=("https://files.pythonhosted.org/packages/source/${_pyname::1}/$_pyname/$_archive.tar.gz")
+sha256sums=('2204dbd95584f67821da5b3771c4305ac5585552b3230b210f1f05322608db2c')
 
 build() {
-  cd pygtrie-$pkgver
-  python setup.py build
+	cd pygtrie-$pkgver
+	python setup.py build
 }
 
-package_python-pygtrie() {
-  depends=('python' 'python-setuptools')
-
-  cd pygtrie-$pkgver
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-  install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/python-pygtrie/LICENSE"
+check() {
+	cd "$_archive"
+	python test.py
 }
 
-package_python2-pygtrie() {
-  depends=('python2' 'python2-setuptools')
-
-  cd pygtrie-$pkgver-py2
-  python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build
-  install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/python2-pygtrie/LICENSE"
+package() {
+	cd "$_archive"
+	python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }