[arch-commits] Commit in python-rdflib/trunk (PKGBUILD py3.7.diff)

[Jan Steffens]

    Date: Sunday, July 29, 2018 @ 16:00:59
  Author: heftig
Revision: 329662

4.2.2-2

Added:
  python-rdflib/trunk/py3.7.diff
Modified:
  python-rdflib/trunk/PKGBUILD

------------+
 PKGBUILD   |   20 ++++++++++++--------
 py3.7.diff |   19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-29 13:33:29 UTC (rev 329661)
+++ PKGBUILD	2018-07-29 16:00:59 UTC (rev 329662)
@@ -6,19 +6,23 @@
 pkgbase=python-rdflib
 pkgname=('python2-rdflib' 'python-rdflib')
 pkgver=4.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A Python library for working with RDF, a simple yet powerful language for representing information"
 arch=('any')
 url="http://rdflib.net/"
 license=('BSD')
 makedepends=('python2-isodate' 'python-isodate' 'python2-setuptools' 'python-setuptools')
-checkdepends=('python2-nose' 'python-nose' 'python2-pyparsing' 'python-pyparsing' 
-              'python2-six' 'python-six' 'python-html5lib' 'python2-html5lib' 'python-sparqlwrapper'
-              'python2-sparqlwrapper')
-source=(rdflib-$pkgver.tar.gz::https://github.com/RDFLib/rdflib/tarball/$pkgver)
-sha1sums=('08fe9d3480af78ca70380eeae082524ce70bb9d3')
+checkdepends=('python2-nose' 'python-nose' 'python2-pyparsing' 'python-pyparsing' 'python2-six'
+              'python-six' 'python-html5lib' 'python2-html5lib' 'python-sparqlwrapper'
+              'python2-sparqlwrapper' 'python-networkx' 'python2-networkx' 'python-decorator'
+              'python2-decorator')
+source=(rdflib-$pkgver.tar.gz::https://github.com/RDFLib/rdflib/tarball/$pkgver
+        py3.7.diff)
+sha1sums=('08fe9d3480af78ca70380eeae082524ce70bb9d3'
+          '71e6b688c981a3f1387f68944580c1e5d5363915')
 
 prepare() {
+  patch -d RDFLib-rdflib-* -p1 < py3.7.diff
   cp -r RDFLib-rdflib-* python2-rdflib
   cd python2-rdflib
   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' rdflib/extras/{describer.py,infixowl.py} \
@@ -39,10 +43,10 @@
   nosetests3 --where=./build/src \
     --with-doctest \
     --doctest-extension=.doctest \
-    --doctest-tests || true # Tests failing - 4.1.2
+    --doctest-tests
   cd ../python2-rdflib
   #python2 setup.py test # Same
-  python2 run_tests.py --with-xunit || true
+  python2 run_tests.py --with-xunit
 }
 
 package_python2-rdflib() {

Added: py3.7.diff
===================================================================
--- py3.7.diff	                        (rev 0)
+++ py3.7.diff	2018-07-29 16:00:59 UTC (rev 329662)
@@ -0,0 +1,19 @@
+diff -u -r RDFLib-rdflib-2fb94c8/rdflib/plugins/sparql/evaluate.py RDFLib-rdflib-2fb94c8-py3.7/rdflib/plugins/sparql/evaluate.py
+--- RDFLib-rdflib-2fb94c8/rdflib/plugins/sparql/evaluate.py	2017-01-29 17:51:48.000000000 +0100
++++ RDFLib-rdflib-2fb94c8-py3.7/rdflib/plugins/sparql/evaluate.py	2018-07-29 17:31:55.614217759 +0200
+@@ -326,9 +326,12 @@
+     # import pdb; pdb.set_trace()
+     res = evalPart(ctx, slice.p)
+     i = 0
+-    while i < slice.start:
+-        res.next()
+-        i += 1
++    try:
++        while i < slice.start:
++            res.next()
++            i += 1
++    except StopIteration:
++        return
+     i = 0
+     for x in res:
+         i += 1