2 files changed, 30 insertions, 28 deletions
diff --git a/abs/core/python_modules/python-py/PKGBUILD b/abs/core/python_modules/python-py/PKGBUILD
index d0fec8b..9a2b083 100644
--- a/abs/core/python_modules/python-py/PKGBUILD
+++ b/abs/core/python_modules/python-py/PKGBUILD
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Sebastian Wiesner <lunaryorn googlemail com>
 # Contributor: Igor Ramos Tiburcio <irtigor@yahoo.com.br>
 # Contributor: Wieland Hoffmann <themineo+aur@gmail.com>
@@ -7,51 +7,54 @@
 # Contributor: Felix Kaiser <felix.kaiser@fxkr.net>
 
 pkgbase=python-py
-pkgname=('python2-py')
-pkgver=1.4.20
-pkgrel=3
+pkgname=('python-py' 'python2-py')
+pkgver=1.5.3
+pkgrel=1
 pkgdesc="library with cross-python path, ini-parsing, io, code, log facilities"
 arch=('any')
 license=('MIT')
-url="http://pylib.readthedocs.org/en/latest/"
-makedepends=('python2-setuptools')
-checkdepends=('python2-pytest')
-source=("http://pypi.python.org/packages/source/p/py/py-$pkgver.tar.gz")
+url="http://py.readthedocs.io/"
+makedepends=('python-setuptools' 'python2-setuptools')
+checkdepends=('python-pytest-runner' 'python2-pytest-runner')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/pytest-dev/py/archive/$pkgver.tar.gz")
+sha512sums=('60a9fc99a61f8a31a91b4217972dd957ea1d651c8818a91e84a957e907abd4f5feff7715ef64f2902d9f0444f8210a93938fc78787992dca484a2a1311523874')
 
 prepare() {
-  cp -r py-${pkgver}{,-py2}
+  cp -a py-$pkgver{,-py2}
+
+  export LC_CTYPE=en_US.UTF-8
 }
 
 build() {
-#  cd "$srcdir/py-${pkgver}"
-#  python setup.py build
+  cd "$srcdir"/py-$pkgver
+  python setup.py build
 
-  cd "$srcdir/py-${pkgver}-py2"
+  cd "$srcdir"/py-$pkgver-py2
   python2 setup.py build
 }
 
 check() {
-#  cd "$srcdir/py-${pkgver}"
-#  LANG=en_US.utf8 py.test
+  # Known failure: https://github.com/pytest-dev/py/issues/104
+
+  cd "$srcdir"/py-$pkgver
+  python setup.py pytest || warning "Tests failed"
 
-  cd "$srcdir/py-${pkgver}-py2"
-  LANG=en_US.utf8 py.test2
+  cd "$srcdir"/py-$pkgver-py2
+  python2 setup.py pytest || warning "Tests failed"
 }
 
-#package_python-py() {
-#  depends=('python')
+package_python-py() {
+  depends=('python')
 
-#  cd py-${pkgver}
-#  python setup.py install --root="${pkgdir}" --optimize=1
-#  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-#}
+  cd py-$pkgver
+  python setup.py install --root="$pkgdir" --optimize=1
+  install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
 
 package_python2-py() {
   depends=('python2')
 
-  cd py-${pkgver}-py2
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd py-$pkgver-py2
+  python2 setup.py install --root="$pkgdir" --optimize=1
+  install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
-
-sha512sums=('db392bd8d52ac2bf7b4785e18aaf58564596f66f15d355ee6f6e4169f6da7847331096ac7118c758ee5ce3f1865502a45f92ca2c99f411c12ee316760ca2b212')
diff --git a/abs/core/python_modules/python-py/__changelog b/abs/core/python_modules/python-py/__changelog
deleted file mode 100644
index 488d3cf..0000000
--- a/abs/core/python_modules/python-py/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-PKGBUILD: rm py 3 stuff