python-html5lib: update to 1.0.1

2 files changed, 46 insertions, 27 deletions

diff --git a/abs/core/python_modules/python-html5lib/PKGBUILD b/abs/core/python_modules/python-html5lib/PKGBUILD
index 0ef62da..4991390 100644
--- a/abs/core/python_modules/python-html5lib/PKGBUILD
+++ b/abs/core/python_modules/python-html5lib/PKGBUILD
@@ -1,42 +1,63 @@
+# Maintainer: Eli Schwartz <eschwartz@archlinux.org>
+# Maintainer: Jelle van der Waa <jelle@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Erol V. Aktay <e.aktay@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgbase=python-html5lib
-pkgname=('python2-html5lib')
-pkgver=0.999999999
+pkgname=('python2-html5lib' 'python-html5lib')
+pkgver=1.0.1
 pkgrel=2
 arch=('any')
 url="https://github.com/html5lib"
 license=('MIT')
-makedepends=('python2' 'unzip' 'python2-webencodings')
-checkdepends=('python2-six' 'python2-pytest' 'python2-lxml' 'python2-mock') 
-source=($pkgbase-$pkgver.tar.gz::https://github.com/html5lib/html5lib-python/archive/${pkgver}.tar.gz
-    LICENSE)
-md5sums=('a81446ef3ce3ef18f5e8e242b7072b83'
-         '838c366f69b72c5df05c96dff79b35f2')
+makedepends=('python-setuptools' 'python2-setuptools' 'python-webencodings' 'python2-webencodings')
+checkdepends=('python-six' 'python2-six' 'python-pytest-expect' 'python2-pytest-expect'
+              'python-lxml' 'python2-lxml' 'python-mock' 'python2-mock')
+_test_commit=c305da74fae50fb018870de7a042da36c1a93b65
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/html5lib/html5lib-python/archive/${pkgver}.tar.gz"
+        "https://github.com/html5lib/html5lib-tests/archive/${_test_commit}.tar.gz")
+sha256sums=('fabbebd6a55d07842087f13849076eeed350aa8bb6c9ec840f6a6aba9388db06'
+            'cb261423c644b3469ac66926e290060b481371d0952995d270492fc761d0209a')
 
-package_python-html5lib() {
-pkgdesc="A Python HTML parser/tokenizer based on the WHATWG HTML5 spec"
-depends=('python' 'python-six' 'python-webencodings')
-    cd ${srcdir}/html5lib-python-${pkgver}
+prepare() {
+    cd "${srcdir}"/html5lib-python-${pkgver}
 
-    python3 setup.py install --root=${pkgdir}
-    install -Dm755 $srcdir/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE  
+    rmdir html5lib/tests/testdata
+    ln -sfT ../../../html5lib-tests-${_test_commit} html5lib/tests/testdata
 }
 
-package_python2-html5lib() {
-depends=('python2' 'python2-six' 'python2-webencodings')
-pkgdesc="A Python2 HTML parser/tokenizer based on the WHATWG HTML5 spec"
-    cd ${srcdir}/html5lib-python-${pkgver}
+build() {
+    cd "${srcdir}"/html5lib-python-${pkgver}
 
-    python2 setup.py install --root=${pkgdir}
-    install -Dm755 $srcdir/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE  
+    python setup.py build
+    python2 setup.py build
 }
 
 check() {
-    cd ${srcdir}/html5lib-python-${pkgver}/html5lib/tests
+    cd "${srcdir}"/html5lib-python-${pkgver}
+
+    py.test
+    py.test2
+}
+
+package_python-html5lib() {
+    pkgdesc="A Python HTML parser/tokenizer based on the WHATWG HTML5 spec"
+    depends=('python' 'python-six' 'python-webencodings')
+    optdepends=('python-lxml: lxml treebuilder'
+                'python-genshi: genshi treewalker')
+    cd "${srcdir}"/html5lib-python-${pkgver}
+
+    python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+    install -Dm755 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_python2-html5lib() {
+    pkgdesc="A Python2 HTML parser/tokenizer based on the WHATWG HTML5 spec"
+    depends=('python2' 'python2-six' 'python2-webencodings')
+    optdepends=('python2-lxml: lxml treebuilder'
+                'python2-genshi: genshi treewalker')
+    cd "${srcdir}"/html5lib-python-${pkgver}
 
-#    nosetests2 
-  
-#    nosetests
+    python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+    install -Dm755 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/abs/core/python_modules/python-html5lib/__changelog b/abs/core/python_modules/python-html5lib/__changelog
deleted file mode 100644
index 4f818ef..0000000
--- a/abs/core/python_modules/python-html5lib/__changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-PKGBUILD: don't build py 3 stuff
-