Split build() and package() stages, correct docs path, add check stage

2 files changed, 36 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbc31cedeac3..bba613ef57f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
 pkgbase = python-agate
 	pkgdesc = A data analysis library that is optimized for humans instead of machines
 	pkgver = 1.6.1
-	pkgrel = 3
+	pkgrel = 4
 	url = http://agate.readthedocs.org/
 	arch = any
 	license = MIT
+	checkdepends = python-cssselect
 	makedepends = python-setuptools
 	makedepends = python-sphinx>=1.2.2
-	makedepends = python-sphinx_rtd_theme>=0.1.6
 	depends = python
 	depends = python-babel>=2.0
-	depends = python-slugify>=1.2.1
-	depends = python-pytimeparse>=1.1.5
-	depends = python-parsedatetime>=2.1
 	depends = python-isodate>=0.5.4
 	depends = python-leather>=0.3.2
+	depends = python-parsedatetime>=2.1
+	depends = python-pytimeparse>=1.1.5
 	depends = python-six>=1.9.0
-	source = https://github.com/wireservice/agate/archive/1.6.1.tar.gz
+	depends = python-slugify>=1.2.1
+	depends = python-sphinx_rtd_theme>=0.1.6
+	source = agate-1.6.1.tar.gz::https://github.com/wireservice/agate/archive/1.6.1.tar.gz
 	sha256sums = 0397d3dcc6ae78b8289294b3bca15b2a7328b9015aed8841bc650700fe2a6cad
 
 pkgname = python-agate
diff --git a/PKGBUILD b/PKGBUILD
index 16ddf36c6014..cc10faee978a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,53 @@
 # Maintainer: Gabriel Magno <gabrielmagno1@gmail.com>
+# Maintainer: Caleb Maclennan <caleb@alerque.com>
 # Contributor: Michał Pałubicki <maln0ir@gmx.com>
 
 _pkgname=agate
 pkgname=python-$_pkgname
 pkgver=1.6.1
-pkgrel=3
-pkgdesc="A data analysis library that is optimized for humans instead of machines"
+pkgrel=4
+pkgdesc='A data analysis library that is optimized for humans instead of machines'
 arch=('any')
-url="http://agate.readthedocs.org/"
+url='http://agate.readthedocs.org/'
 license=('MIT')
 depends=(
     'python'
     'python-babel>=2.0'
-    'python-slugify>=1.2.1'
-    'python-pytimeparse>=1.1.5'
-    'python-parsedatetime>=2.1'
     'python-isodate>=0.5.4'
     'python-leather>=0.3.2'
+    'python-parsedatetime>=2.1'
+    'python-pytimeparse>=1.1.5'
     'python-six>=1.9.0'
+    'python-slugify>=1.2.1'
+    'python-sphinx_rtd_theme>=0.1.6'
   )
 makedepends=(
     'python-setuptools'
     'python-sphinx>=1.2.2'
-    'python-sphinx_rtd_theme>=0.1.6'
   )
-source=("https://github.com/wireservice/agate/archive/${pkgver}.tar.gz")
+checkdepends=(
+    'python-cssselect'
+  )
+source=("$_pkgname-$pkgver.tar.gz::https://github.com/wireservice/$_pkgname/archive/$pkgver.tar.gz")
 sha256sums=('0397d3dcc6ae78b8289294b3bca15b2a7328b9015aed8841bc650700fe2a6cad')
 
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  python setup.py install --root="$pkgdir/" --optimize=1
+build() {
+    cd "$_pkgname-$pkgver"
+    python setup.py build
+    python setup.py build_sphinx
+    _rtd_theme_path="$(python -c 'import sphinx_rtd_theme; print(sphinx_rtd_theme.get_html_theme_path())')"
+    rm -rvf "build/sphinx/html/_static"
+    ln -svf "$_rtd_theme_path/sphinx_rtd_theme/static" "build/sphinx/html/_static"
+}
 
-  python setup.py build_sphinx
-  mkdir -p "$pkgdir/usr/share/doc"
-  cp -rv "$srcdir/$_pkgname-$pkgver/build/sphinx/html" "$pkgdir/usr/share/doc/$_pkgname"
+check() {
+    cd "$_pkgname-$pkgver"
+    python setup.py test --test-suite=tests
 }
 
-# vim:set ts=2 sw=2 et:
+package() {
+    cd "$_pkgname-$pkgver"
+    python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+    mkdir -p "$pkgdir/usr/share/doc"
+    cp -rv "build/sphinx/html" "$pkgdir/usr/share/doc/$pkgname"
+}