Attachment 869938 Details for Bug 1070074 – Make SPARQLWrapper optional require for 4.1

[patch] Make SPARQLWrapper optional require for 4.1

0003-Make-SPARQLWrapper-optional-require-for-4.1.patch (text/plain), 2.99 KB, created by Dan Scott on 2014-03-03 14:07:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Scott

Created: 2014-03-03 14:07:52 UTC

Size: 2.99 KB

patch

obsolete

>From d3d861699c53085f856a89cabfd399d720b349d0 Mon Sep 17 00:00:00 2001
>From: Dan Scott <dan@coffeecode.net>
>Date: Sun, 2 Mar 2014 20:01:29 -0500
>Subject: [PATCH 3/4] Make SPARQLWrapper optional require for 4.1
>
>Per upstream discussion, SPARQLWrapper will be an optional dependency for 4.1
>but will become mandatory for 4.2. This will give distributions like Fedora
>time to ensure SPARQLWrapper is packaged.
>
>Signed-off-by: Dan Scott <dan@coffeecode.net>
>---
> python-rdflib-SPARQLWrapper-optional.patch | 40 ++++++++++++++++++++++++++++++
> python-rdflib.spec                         |  2 ++
> 2 files changed, 42 insertions(+)
> create mode 100644 python-rdflib-SPARQLWrapper-optional.patch
>
>diff --git a/python-rdflib-SPARQLWrapper-optional.patch b/python-rdflib-SPARQLWrapper-optional.patch
>new file mode 100644
>index 0000000..96c2aa2
>--- /dev/null
>+++ b/python-rdflib-SPARQLWrapper-optional.patch
>@@ -0,0 +1,40 @@
>+From 7b69cb5f2fe46d46814712cdc43123807c681dc3 Mon Sep 17 00:00:00 2001
>+From: Dan Scott <dan@coffeecode.net>
>+Date: Sun, 2 Mar 2014 19:55:08 -0500
>+Subject: [PATCH] Make SPARQLWrapper an extra_requires for now
>+
>+Per discussion in https://github.com/RDFLib/rdflib/pull/359
>+
>+Signed-off-by: Dan Scott <dan@coffeecode.net>
>+---
>+ setup.py | 7 ++++---
>+ 1 file changed, 4 insertions(+), 3 deletions(-)
>+
>+diff --git a/setup.py b/setup.py
>+index c00a978..380d449 100644
>+--- a/setup.py
>++++ b/setup.py
>+@@ -41,8 +41,8 @@ if sys.version_info[0] >= 3:
>+     kwargs['install_requires'] = ['isodate', 'pyparsing']
>+     kwargs['tests_require'] = ['html5lib']
>+     kwargs['requires'] = [
>+-        'isodate', 'pyparsing',
>+-        'SPARQLWrapper']
>++        'isodate', 'pyparsing']
>++    kwargs['extras_require'] = {'SPARQLStore': 'SPARQLWrapper'}
>+     kwargs['src_root'] = setup_python3()
>+     assert setup
>+ else:
>+@@ -52,7 +52,8 @@ else:
>+         kwargs['test_suite'] = "nose.collector"
>+         kwargs['install_requires'] = [
>+             'isodate',
>+-            'pyparsing', 'SPARQLWrapper']
>++            'pyparsing']
>++        kwargs['extras_require'] = {'SPARQLStore': 'SPARQLWrapper'}
>+ 
>+         if sys.version_info[1]<7:  # Python 2.6
>+             kwargs['install_requires'].append('ordereddict')
>+-- 
>+1.8.5.3
>+
>diff --git a/python-rdflib.spec b/python-rdflib.spec
>index d75cdf8..bbe0e2d 100644
>--- a/python-rdflib.spec
>+++ b/python-rdflib.spec
>@@ -11,6 +11,7 @@ URL:            https://github.com/RDFLib/rdflib
> Source0:        http://pypi.python.org/packages/source/r/rdflib/rdflib-%{version}.tar.gz
> Patch1:         python-rdflib-skip-SPARQLStore-test.patch
> Patch2:         unpin-html5lib-requirement.patch
>+Patch3:         python-rdflib-SPARQLWrapper-optional.patch
> BuildArch:      noarch
> 
> BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
>@@ -44,6 +45,7 @@ A SPARQL 1.1 engine is also included.
> %setup -q -n rdflib-%{version}
> %patch1 -p1
> %patch2 -p1
>+%patch3 -p1
> find -name "*.pyc" -delete
> 
> sed -i -e 's|_sn_gen=bnode_uuid()|_sn_gen=bnode_uuid|' test/test_bnode_ncname.py
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1070074: 868120 | 868133 | 868157 | 868159 | 869736 | 869936 | 869937 | 869938 | 869939 | 870443