[arch-commits] Commit in python-couchdb/trunk (PKGBUILD)

[Felix Yan]

    Date: Saturday, August 6, 2016 @ 15:28:59
  Author: felixonmars
Revision: 185624

upgpkg: python-couchdb 1.1-1

Modified:
  python-couchdb/trunk/PKGBUILD

----------+
 PKGBUILD |   51 ++++++++++++++++++---------------------------------
 1 file changed, 18 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2016-08-06 15:15:53 UTC (rev 185623)
+++ PKGBUILD    2016-08-06 15:28:59 UTC (rev 185624)
@@ -6,21 +6,22 @@
 
 pkgbase=python-couchdb
 pkgname=(python-couchdb python2-couchdb)
-pkgver=1.0.1
+pkgver=1.1
+_commit=38f48c6d13cce15112f93fa97b4b8b67fb857632
 pkgrel=1
 pkgdesc="Python library for working with CouchDB"
-url="http://code.google.com/p/couchdb-python/";
+url="https://github.com/djc/couchdb-python/";
 license=('BSD')
 arch=('any')
-makedepends=('python-setuptools' 'python2-setuptools')
-checkdepends=('couchdb')
-source=(http://pypi.python.org/packages/source/C/CouchDB/CouchDB-$pkgver.tar.gz)
-md5sums=('bcedc91f6154b7563dfb34b3d854c6c6')
+makedepends=('python-setuptools' 'python2-setuptools' 'git')
+checkdepends=('python-pifpaf' 'couchdb')
+source=("git+https://github.com/djc/couchdb-python.git#commit=$_commit";)
+md5sums=('SKIP')
 
 prepare() {
-  cp -a CouchDB-$pkgver{,-py2}
+  cp -a couchdb-python{,-py2}
 
-  cd "$srcdir/CouchDB-$pkgver-py2"
+  cd "$srcdir"/couchdb-python-py2
   sed -i 's/python /python2 /' Makefile
   find . -name "*.py" -exec \
     sed -i '1s|env python$|env python2|' {} \;
@@ -27,41 +28,25 @@
 }
 
 build() {
-  cd "$srcdir/CouchDB-$pkgver"
+  cd "$srcdir"/couchdb-python
   python setup.py build
 
-  cd "$srcdir/CouchDB-$pkgver-py2"
+  cd "$srcdir"/couchdb-python-py2
   python2 setup.py build
 }
 
 check() {
-  mkdir "$srcdir/tmp_couchdb"
-  cat > "$srcdir/tmp_couchdb.conf" << EOF
-[couchdb]
-database_dir = "$srcdir/tmp_couchdb"
-view_index_dir = "$srcdir/tmp_couchdb"
-uri_file = "$srcdir/tmp_couchdb.uri"
-[log]
-file = "$srcdir/tmp_couchdb.log"
-EOF
+  cd "$srcdir"/couchdb-python
+  pifpaf run couchdb python setup.py test || warning "python 3 tests failed"
 
-  couchdb -a "$srcdir/tmp_couchdb.conf" &
-  _COUCHDB_PID=$!
-  sleep 3;
-
-  cd "$srcdir/CouchDB-$pkgver"
-  python setup.py test || warning "python 3 tests failed"
-
-  cd "$srcdir/CouchDB-$pkgver-py2"
-  python2 setup.py test
-
-  kill $_COUCHDB_PID
+  cd "$srcdir"/couchdb-python-py2
+  pifpaf run couchdb python2 setup.py test
 }
 
 package_python-couchdb() {
   depends=('python-setuptools')
 
-  cd "$srcdir/CouchDB-$pkgver"
+  cd couchdb-python
   python setup.py install --root="$pkgdir" --optimize=1
 
   install -D -m644 "COPYING" \
@@ -71,13 +56,13 @@
 package_python2-couchdb() {
   depends=('python2-setuptools')
 
-  cd "$srcdir/CouchDB-$pkgver-py2"
+  cd couchdb-python-py2
   python2 setup.py install --root="$pkgdir" --optimize=1
 
   install -D -m644 "COPYING" \
     "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 
-  for name in couchdb-dump couchdb-load couchdb-replicate couchpy; do
+  for name in couchdb-dump couchdb-load couchdb-replicate couchpy 
couchdb-load-design-doc; do
     mv "$pkgdir/usr/bin/$name"{,2}
   done
 }