mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 10:17:08 -08:00
dev-python/rdflib: Add python3_7 to PYTHON_COMPAT
Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
@@ -0,0 +1,72 @@
|
||||
Traceback (most recent call last):
|
||||
File "/var/tmp/portage/dev-python/rdflib-4.2.2/work/rdflib-4.2.2-python3_7/build/src/rdflib/plugins/sparql/evaluate.py", line 330, in evalSlice
|
||||
next(res)
|
||||
StopIteration
|
||||
|
||||
The above exception was the direct cause of the following exception:
|
||||
|
||||
Traceback (most recent call last):
|
||||
File "/usr/lib/python3.7/site-packages/nose/case.py", line 197, in runTest
|
||||
self.test(*self.arg)
|
||||
File "/var/tmp/portage/dev-python/rdflib-4.2.2/work/rdflib-4.2.2-python3_7/build/src/test/test_dawg.py", line 434, in query_test
|
||||
set(res2)
|
||||
File "/var/tmp/portage/dev-python/rdflib-4.2.2/work/rdflib-4.2.2-python3_7/build/src/rdflib/query.py", line 258, in __iter__
|
||||
for b in self._genbindings:
|
||||
RuntimeError: generator raised StopIteration
|
||||
|
||||
Patch backported from
|
||||
https://github.com/RDFLib/rdflib/commit/58c45d6f30af88a22f60edcb9a459648a885e226
|
||||
|
||||
--- a/rdflib/plugins/sparql/evaluate.py
|
||||
+++ b/rdflib/plugins/sparql/evaluate.py
|
||||
@@ -15,6 +15,7 @@
|
||||
"""
|
||||
|
||||
import collections
|
||||
+import itertools
|
||||
|
||||
from rdflib import Variable, Graph, BNode, URIRef, Literal
|
||||
|
||||
@@ -323,22 +324,9 @@
|
||||
|
||||
|
||||
def evalSlice(ctx, slice):
|
||||
- # import pdb; pdb.set_trace()
|
||||
res = evalPart(ctx, slice.p)
|
||||
- i = 0
|
||||
- while i < slice.start:
|
||||
- res.next()
|
||||
- i += 1
|
||||
- i = 0
|
||||
- for x in res:
|
||||
- i += 1
|
||||
- if slice.length is None:
|
||||
- yield x
|
||||
- else:
|
||||
- if i <= slice.length:
|
||||
- yield x
|
||||
- else:
|
||||
- break
|
||||
+
|
||||
+ return itertools.islice(res, slice.start, slice.start+slice.length if slice.length is not None else None)
|
||||
|
||||
|
||||
def evalReduced(ctx, part):
|
||||
--- a/rdflib/query.py
|
||||
+++ b/rdflib/query.py
|
||||
@@ -1,5 +1,6 @@
|
||||
|
||||
import os
|
||||
+import itertools
|
||||
import shutil
|
||||
import tempfile
|
||||
import warnings
|
||||
@@ -181,7 +182,7 @@
|
||||
return self._bindings
|
||||
|
||||
def _set_bindings(self, b):
|
||||
- if isinstance(b, types.GeneratorType):
|
||||
+ if isinstance(b, (types.GeneratorType, itertools.islice)):
|
||||
self._genbindings = b
|
||||
self._bindings = []
|
||||
else:
|
||||
@@ -0,0 +1,99 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
|
||||
PYTHON_REQ_USE="sqlite?,threads(+)"
|
||||
|
||||
# The usual required for tests
|
||||
DISTUTILS_IN_SOURCE_BUILD=1
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="RDF library containing a triple store and parser/serializer"
|
||||
HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="doc berkdb examples mysql redland sqlite test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/isodate[${PYTHON_USEDEP}]
|
||||
dev-python/html5lib[${PYTHON_USEDEP}]
|
||||
dev-python/pyparsing[${PYTHON_USEDEP}]
|
||||
berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
|
||||
mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
|
||||
redland? ( dev-libs/redland-bindings[python,$(python_gen_usedep 'python2*')] )"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
|
||||
test? (
|
||||
dev-python/sparql-wrapper[${PYTHON_USEDEP}]
|
||||
>=dev-python/nose-1.3.1-r1[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
PATCHES=(
|
||||
# Python 3.7 StopIteration bug
|
||||
"${FILESDIR}"/${PN}-4.2.2-python3.7-StopIteration.patch
|
||||
)
|
||||
|
||||
python_prepare_all() {
|
||||
# Upstream manufactured .pyc files which promptly break distutils' src_test
|
||||
find -name "*.py[oc~]" -delete || die
|
||||
|
||||
# Bug 358189; take out tests that attempt to connect to the network
|
||||
sed -e "/'--with-doctest',/d" -e "/'--doctest-extension=.doctest',/d" \
|
||||
-e "/'--doctest-tests',/d" -i run_tests.py || die
|
||||
|
||||
sed -e "s: 'sphinx.ext.intersphinx',::" -i docs/conf.py || die
|
||||
|
||||
# doc build requires examples folder at the upper level of docs
|
||||
if use doc; then
|
||||
cd docs || die
|
||||
ln -sf ../examples . || die
|
||||
cd ../ || die
|
||||
fi
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_compile_all() {
|
||||
# https://github.com/RDFLib/rdflib/issues/510
|
||||
if use doc; then
|
||||
einfo ""
|
||||
einfo "Several warnings and Errors present in the build"
|
||||
einfo "For a complete build, it is required to install"
|
||||
einfo "github.com/gjhiggins/n3_pygments_lexer and"
|
||||
einfo "github.com/gjhiggins/sparql_pygments_lexer"
|
||||
einfo "outside portage via pip or by cloning. These have not been"
|
||||
einfo "given a tagged release by the author and are not in portage"
|
||||
einfo ""
|
||||
|
||||
emake -C docs html
|
||||
HTML_DOCS=( docs/_build/html/. )
|
||||
fi
|
||||
}
|
||||
|
||||
python_test() {
|
||||
# the default; nose with: --where=./ does not work for python3
|
||||
if python_is_python3; then
|
||||
pushd "${BUILD_DIR}/src/" >/dev/null || die
|
||||
"${EPYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
|
||||
popd >/dev/null || die
|
||||
else
|
||||
"${EPYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
|
||||
fi
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
distutils-r1_python_install_all
|
||||
|
||||
if use examples; then
|
||||
dodoc -r examples
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user