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

[Eli Schwartz]

    Date: Sunday, July 1, 2018 @ 06:19:23
  Author: eschwartz
Revision: 349276

upgpkg: python-apsw 3.23.1-2

python 3.7 rebuild

Modified:
  python-apsw/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-01 06:17:04 UTC (rev 349275)
+++ PKGBUILD	2018-07-01 06:19:23 UTC (rev 349276)
@@ -5,7 +5,7 @@
 pkgbase=python-apsw
 pkgname=('python-apsw' 'python2-apsw')
 pkgver=3.23.1
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://github.com/rogerbinns/apsw"
 license=('MIT')
@@ -15,22 +15,19 @@
 md5sums=('0f3c896693e9e0ec6792e5b2d2dbb362')
 
 build() {
-  cp -rf apsw-${pkgver}-r1 apsw2
+  cd apsw-${pkgver}-r1
 
-  cd apsw-${pkgver}-r1
   python setup.py build --enable=load_extension
-  cd "$srcdir"/apsw2
   python2 setup.py build --enable=load_extension
 }
 
 check() {
-  cd "$srcdir"/apsw2
-  export PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH"
-  python2 setup.py test
+  cd "$srcdir"/apsw-${pkgver}-r1
 
-  cd "$srcdir"/apsw-${pkgver}-r1
-  export PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.6:$PYTHONPATH"
-  python setup.py test
+  # do glob expansion in variable assignment
+  pythonpaths=("$PWD/build/lib.linux-$CARCH"-3* "$PWD/build/lib.linux-$CARCH-"2*)
+  PYTHONPATH="${pythonpaths[0]}" python setup.py test
+  PYTHONPATH="${pythonpaths[1]}" python2 setup.py test
 }
 
 package_python-apsw() {
@@ -45,7 +42,7 @@
 package_python2-apsw() {
 depends+=('python2')
 pkgdesc="Python2 wrapper for SQLite"
-  cd "$srcdir"/apsw2
+  cd "$srcdir"/apsw-${pkgver}-r1
   python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build
 
   install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE