From ea7294db2b35791a065ac5bfcf2cd936ee37626e89277c8afb1a8e8cf51afdd5 Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 8 May 2017 14:21:35 +0000 Subject: [PATCH] Accepting request 492711 from home:TheBlackCat:branches:devel:languages:python - Update to version 4.2.2 - Implement single-spec version - Fix source URL. OBS-URL: https://build.opensuse.org/request/show/492711 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-rdflib?expand=0&rev=48 --- python-rdflib.changes | 86 ++++++++++++++++++++++++++++++ python-rdflib.spec | 120 +++++++++++++++--------------------------- rdflib-4.2.1.tar.gz | 3 -- rdflib-4.2.2.tar.gz | 3 ++ 4 files changed, 131 insertions(+), 81 deletions(-) delete mode 100644 rdflib-4.2.1.tar.gz create mode 100644 rdflib-4.2.2.tar.gz diff --git a/python-rdflib.changes b/python-rdflib.changes index e2b1a90..97dbf20 100644 --- a/python-rdflib.changes +++ b/python-rdflib.changes @@ -1,3 +1,89 @@ +------------------------------------------------------------------- +Wed May 3 16:47:44 UTC 2017 - toddrme2178@gmail.com + +- Update to version 4.2.2 + + Bug fixes: + * SPARQL bugs fixed: + * Fix for filters in sub-queries + * Fixed bind, initBindings and filter problems + * Fixed unexpected None value in SPARQL-update + * Fix sparql, group by and count of null values with `optional` + * Fixed sparql sub-query and aggregation bugs + * Fixed parsing Complex BGPs as triples + * Fixed DISTINCT being ignored inside aggregate functions + * Fix unicode encoding errors in sparql processor + * Fixed SPARQL select nothing no longer returning a `None` row + * Fixed aggregate operators COUNT and SAMPLE to ignore unbound / NULL values + * Fix sparql relative uris + * SPARQL can now compare xsd:date type as well, fixes #532 + * fix sparql path order on python3: "TypeError: unorderable types: SequencePath() < SequencePath()"" + * SPARQL parser now robust to spurious semicolon + * Let paths be comparable against all nodes even in py3 (preparedQuery error) + * Made behavior of `initN` in `update` and `query` more consistent + * SparqlStore: + * SparqlStore now closes underlying urllib response body + * SparqlStore injectPrefixes only modifies query if prefixes present and if adds a newline in between + * Fixes and tests for AuditableStore + * Trig bugs fixed: + * trig export of multiple graphs assigns wrong prefixes to prefixedNames + * Trig serialiser writing empty named graph name for default graph + * Trig parser can creating multiple contexts for the default graph + * Trig serialisation handling prefixes incorrectly + * Fixed Nquads parser handling of triples in default graph + * Fixed TypeError in Turtle serializer (unorderable types: DocumentFragment() > DocumentFragment()) + * Fixed serialization and parsing of inf/nan + * Fixed RDFa parser from failing on time elements with child nodes + * Fix double reduction of \\ escapes in from_n3 + * Fixed handling of xsd:base64Binary + * Fixed Collection.__setitem__ broken + * Fix ImportError when __main__ already loaded + * Fixed broken top_level.txt file in distribution + + Enhancements: + * Added support for Python 3.5+ + * More aliases for common formats (nt, turtle) + * Improved RDF1.1 ntriples support + * Dependencies updated and improved compatibility with pyparsing, html5lib, SPARQLWrapper and elementtree + * Improved prefix for SPARQL namespace in XML serialization + * Performance improvements: + * SPARQL Aggregation functions don't build up memory for each row + * Collections now support += (__iadd__), fixes slow creation of large lists + * SPARQL Optimisation to expand BGPs in a smarter way + * SPARQLStore improvements + * improved SPARQLStore BNode customizability + * Adding the option of using POST for long queries in SPARQLStore + * Exposed the timeout of SPARQLWrapper + * SPARQL prepared query now carries the original (unparsed) parameters + * added .n3 methods for path objects + * Added support for xsd:gYear and xsd:gYearMonth + * Allow duplicates in rdf:List + * Improved slicing of Resource objects + + Cleanups: + * cleanup: SPARQL Prologue and Query new style classes + * Reduce amount of warnings, especially closing opened file pointers + * Improved ntriples parsing exceptions to actually tell you what's wrong + * remove ancient and broken 2.3 support code. + * Logger output improved + * properly cite RGDA1 + * Avoid class reference to imported function + * Use find_packages for package discovery. + * Prepared ClosedNamespace (and _RDFNamespace) to inherit from Namespace (5.0.0) + * Avoid verbose build logging + * (ultra petty) Remove an unused import + + Testing improvements: + * updating deprecated testing syntax + * make test 375 more portable (use sys.executable rather than python) + * Removed outdated, skipped test for #130 that depended on content from the internet + * enable all warnings during travis nosetests + * travis updates + * travis also builds release branches + + Doc improvements: + * Update list of builtin serialisers in docstring + * Update reference to "Emulating container types" + * docs: clarify the use of an identifier when persisting a triplestore + * DOC: unamed -> unnamed, typos +- Implement single-spec version +- Fix source URL. + ------------------------------------------------------------------- Mon Sep 12 13:58:57 UTC 2016 - aplanas@suse.com diff --git a/python-rdflib.spec b/python-rdflib.spec index ff189d2..318e680 100644 --- a/python-rdflib.spec +++ b/python-rdflib.spec @@ -1,7 +1,7 @@ # # spec file for package python-rdflib # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,42 +15,42 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# Tests don't work and cause a dependency loop with python-SPARQLWrapper +%bcond_with tests +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-rdflib -Version: 4.2.1 +Version: 4.2.2 Release: 0 Summary: A Python library for working with RDF License: BSD-3-Clause Group: Development/Libraries/Python Url: http://rdflib.net/ -Source: https://pypi.io/packages/source/r/rdflib/rdflib-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/r/rdflib/rdflib-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes -# TODO(aplanas) Because we are not still running tests, we can break -# the dependency cycle here. -# BuildRequires: python-SPARQLWrapper -BuildRequires: python-Sphinx -BuildRequires: python-devel -BuildRequires: python-flake8 -BuildRequires: python-html5lib -BuildRequires: python-isodate -BuildRequires: python-nose -BuildRequires: python-pyparsing -BuildRequires: python-setuptools -BuildRequires: python-xml +BuildRequires: python-rpm-macros +BuildRequires: python3-2to3 +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module html5lib} +BuildRequires: %{python_module isodate} +BuildRequires: %{python_module pyparsing} +BuildRequires: %{python_module xml} +BuildRequires: python3-Sphinx +%if %{with tests} +BuildRequires: %{python_module SPARQLWrapper} +BuildRequires: %{python_module flake8} +BuildRequires: %{python_module nose} +%endif Requires: python-SPARQLWrapper Requires: python-flake8 Requires: python-html5lib Requires: python-isodate Requires: python-pyparsing Requires: python-xml -Requires(post): update-alternatives -Requires(postun): update-alternatives -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif +%python_subpackages %description RDFLib is a Python library for working with RDF, a simple yet powerful @@ -58,12 +58,12 @@ language for representing information. The library contains an RDF/XML parser/serializer that conforms to the RDF/XML Syntax Specification (Revised). The library also contains both in-memory and persistent Graph backends. -%package doc +%package -n %{name}-doc Summary: A Python library for working with RDF -Group: Development/Libraries/Python -Recommends: %{name} = %{version} +Group: Documentation/Other +Provides: %{python_module rdflib-doc = %{version}} -%description doc +%description -n %{name}-doc RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information. The library contains an RDF/XML parser/serializer that conforms to the RDF/XML Syntax Specification (Revised). @@ -75,73 +75,37 @@ The library also contains both in-memory and persistent Graph backends. find rdflib -name "*.py" | xargs sed -i '1 { /^#!/ d }' %build -python setup.py build -cd docs +%python_build + +pushd docs make html # Remove hidden file rm -r _build/html/.buildinfo +popd %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} - -# for update-alternatives -mkdir -p %{buildroot}%{_sysconfdir}/alternatives -for f in csv2rdf rdf2dot rdfgraphisomorphism rdfpipe rdfs2dot; do - mv %{buildroot}%{_bindir}/$f %{buildroot}%{_bindir}/$f-%{py_ver} - touch %{buildroot}%{_sysconfdir}/alternatives/$f - ln -sf %{_sysconfdir}/alternatives/$f %{buildroot}%{_bindir}/$f -done +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %fdupes -s docs/_build/html -%pre -# Since /usr/bin/* became ghosted to be used with update-alternatives, we have to get rid -# of the old binary resulting from the non-update-alternativies-ified package: -[ -h %{_bindir}/csv2rdf ] || rm -f %{_bindir}/csv2rdf -[ -h %{_bindir}/rdf2dot ] || rm -f %{_bindir}/rdf2dot -[ -h %{_bindir}/rdfgraphisomorphism ] || rm -f %{_bindir}/rdfgraphisomorphism -[ -h %{_bindir}/rdfpipe ] || rm -f %{_bindir}/rdfpipe -[ -h %{_bindir}/rdfs2dot ] || rm -f %{_bindir}/rdfs2dot +%if %{with tests} +%check +%python_exec setup.py -q test +%endif -%post -update-alternatives \ - --install %{_bindir}/rdfpipe rdfpipe %{_bindir}/rdfpipe-%{py_ver} 30 \ - --slave %{_bindir}/csv2rdf csv2rdf %{_bindir}/csv2rdf%{py_ver} \ - --slave %{_bindir}/rdf2dot rdf2dot %{_bindir}/rdf2dot%{py_ver} \ - --slave %{_bindir}/rdfgraphisomorphism graphisomorpishm %{_bindir}/rdfgraphisomorphism%{py_ver} \ - --slave %{_bindir}/rdfs2dot rdfs2dot %{_bindir}/rdfs2dot%{py_ver} - -%preun -if [ $1 -eq 0 ] ; then - update-alternatives --remove rdfpipe %{_bindir}/rdfpipe-%{py_ver} -fi - -# Not working -#%%check -# python setup.py -q test - -%files +%files %{python_files} %defattr(-,root,root) %doc CHANGELOG.md LICENSE CONTRIBUTORS README.md -%ghost %{_sysconfdir}/alternatives/csv2rdf -%ghost %{_sysconfdir}/alternatives/rdf2dot -%ghost %{_sysconfdir}/alternatives/rdfgraphisomorphism -%ghost %{_sysconfdir}/alternatives/rdfpipe -%ghost %{_sysconfdir}/alternatives/rdfs2dot -%{_bindir}/csv2rdf-%{py_ver} -%{_bindir}/rdf2dot-%{py_ver} -%{_bindir}/rdfgraphisomorphism-%{py_ver} -%{_bindir}/rdfpipe-%{py_ver} -%{_bindir}/rdfs2dot-%{py_ver} -%{_bindir}/csv2rdf -%{_bindir}/rdf2dot -%{_bindir}/rdfgraphisomorphism -%{_bindir}/rdfpipe -%{_bindir}/rdfs2dot +%python3_only %{_bindir}/csv2rdf +%python3_only %{_bindir}/rdf2dot +%python3_only %{_bindir}/rdfgraphisomorphism +%python3_only %{_bindir}/rdfpipe +%python3_only %{_bindir}/rdfs2dot %{python_sitelib}/rdflib/ %{python_sitelib}/rdflib-%{version}-py*.egg-info -%files doc +%files -n %{name}-doc %defattr(-,root,root) %doc docs/_build/html diff --git a/rdflib-4.2.1.tar.gz b/rdflib-4.2.1.tar.gz deleted file mode 100644 index 821e2b2..0000000 --- a/rdflib-4.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb02bd235606ef3b26e213da3e576557a6392ce103efd8c6c8ff1e08321608c8 -size 889467 diff --git a/rdflib-4.2.2.tar.gz b/rdflib-4.2.2.tar.gz new file mode 100644 index 0000000..2808c1f --- /dev/null +++ b/rdflib-4.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da1df14552555c5c7715d8ce71c08f404c988c58a1ecd38552d0da4fc261280d +size 905094