upgpkg: python-importlab 0.8-1

2 files changed, 52 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dbe67899f007..c9a12328eeb4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = python-importlab
-	pkgdesc = A library to calculate python dependency graphs.
-	pkgver = 0.6.1
-	pkgrel = 3
+	pkgdesc = A library to calculate Python dependency graphs
+	pkgver = 0.8
+	pkgrel = 1
 	url = https://github.com/google/importlab
 	arch = any
-	license = APACHE
-	makedepends = python
+	license = Apache
+	makedepends = git
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-setuptools
+	makedepends = python-wheel
+	depends = python
 	depends = python-networkx
-	depends = python-six
-	options = !emptydirs
-	source = https://files.pythonhosted.org/packages/source/i/importlab/importlab-0.6.1.tar.gz
-	sha256sums = 056503329df1ba8f6291a4b548042aa18620ad91d39388ba58044f0fd44ff83e
+	source = python-importlab::git+https://github.com/google/importlab#commit=13737c19e056f1095486c522adafa0f4b71f31a8
+	b2sums = SKIP
 
 pkgname = python-importlab
diff --git a/PKGBUILD b/PKGBUILD
index 0e14ce5b1d69..3a0f8535d01b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,52 @@
-# Maintainer: Mark Merritt <mark@marktmerritt.com>
+# Maintainer: George Rawlinson <grawlinson@archlinux.org>
+# Contributor: Mark Merritt <mark@marktmerritt.com>
 # Contributor: Kaizhao Zhang <zhangkaizhao@gmail.com>
 
 pkgname=python-importlab
-_name=${pkgname#python-}
-pkgver=0.6.1
-pkgrel=3
-pkgdesc="A library to calculate python dependency graphs."
+pkgver=0.8
+pkgrel=1
+pkgdesc='A library to calculate Python dependency graphs'
 arch=('any')
-url="https://github.com/google/importlab"
-license=('APACHE')
-depends=('python-networkx' 'python-six')
-makedepends=('python' 'python-setuptools')
-options=(!emptydirs)
-source=(
-  "https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz"
+url='https://github.com/google/importlab'
+license=('Apache')
+depends=(
+  'python'
+  'python-networkx'
 )
-sha256sums=(
-  "056503329df1ba8f6291a4b548042aa18620ad91d39388ba58044f0fd44ff83e"
+makedepends=(
+  'git'
+  'python-build'
+  'python-installer'
+  'python-setuptools'
+  'python-wheel'
 )
-prepare() {
-  cd "${srcdir}/${_name}-${pkgver}"
-  # Fix permissions
-  chmod -R +r *
+#checkdepends=('')
+#optdepends=('')
+_commit='13737c19e056f1095486c522adafa0f4b71f31a8'
+source=("$pkgname::git+$url#commit=$_commit")
+b2sums=('SKIP')
+
+pkgver() {
+  cd "$pkgname"
+
+  # get from setup.py since there are no tagged releases
+  grep '^VERSION' setup.py | sed -e "s/VERSION = '\(.*\)'/\1/"
 }
+
 build() {
-  cd "${srcdir}/${_name}-${pkgver}"
-  python setup.py build
+  cd "$pkgname"
+
+  python -m build --wheel --no-isolation
 }
+
+#check() {
+#  cd "$pkgname"
+#
+#  # TODO
+#}
+
 package() {
-  cd "${srcdir}/${_name}-${pkgver}"
-  install -Dm644 README.rst "${pkgdir}/usr/share/doc/${pkgname}/README.rst"
-  install -Dm644 CHANGELOG "${pkgdir}/usr/share/doc/${pkgname}/CHANGELOG"
-  install -Dm644 CONTRIBUTING.md "${pkgdir}/usr/share/doc/${pkgname}/CONTRIBUTING.md"
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  python setup.py install --root="${pkgdir}/" --optimize=1 --skip-build
+  cd "$pkgname"
+
+  python -m installer --destdir="$pkgdir" dist/*.whl
 }