|
 |
499cd94 |
From 7b69cb5f2fe46d46814712cdc43123807c681dc3 Mon Sep 17 00:00:00 2001
|
|
|
499cd94 |
From: Dan Scott <dan@coffeecode.net>
|
|
|
499cd94 |
Date: Sun, 2 Mar 2014 19:55:08 -0500
|
|
|
499cd94 |
Subject: [PATCH] Make SPARQLWrapper an extra_requires for now
|
|
|
499cd94 |
|
|
|
499cd94 |
Per discussion in https://github.com/RDFLib/rdflib/pull/359
|
|
|
499cd94 |
|
|
|
499cd94 |
Signed-off-by: Dan Scott <dan@coffeecode.net>
|
|
|
499cd94 |
---
|
|
|
499cd94 |
diff --git a/setup.py b/setup.py
|
|
 |
cd0dee6 |
index c21cc27..d7a8347 100644
|
|
|
499cd94 |
--- a/setup.py
|
|
|
499cd94 |
+++ b/setup.py
|
|
|
499cd94 |
@@ -41,8 +41,8 @@ if sys.version_info[0] >= 3:
|
|
|
499cd94 |
kwargs['install_requires'] = ['isodate', 'pyparsing']
|
|
|
cd0dee6 |
kwargs['tests_require'] = ['html5lib', 'networkx']
|
|
|
499cd94 |
kwargs['requires'] = [
|
|
|
499cd94 |
- 'isodate', 'pyparsing',
|
|
|
499cd94 |
- 'SPARQLWrapper']
|
|
|
499cd94 |
+ 'isodate', 'pyparsing']
|
|
|
499cd94 |
+ kwargs['extras_require'] = {'SPARQLStore': 'SPARQLWrapper'}
|
|
|
499cd94 |
kwargs['src_root'] = setup_python3()
|
|
|
499cd94 |
assert setup
|
|
|
499cd94 |
else:
|
|
|
499cd94 |
@@ -52,7 +52,8 @@ else:
|
|
|
499cd94 |
kwargs['test_suite'] = "nose.collector"
|
|
|
499cd94 |
kwargs['install_requires'] = [
|
|
|
499cd94 |
'isodate',
|
|
|
499cd94 |
- 'pyparsing', 'SPARQLWrapper']
|
|
|
499cd94 |
+ 'pyparsing']
|
|
|
499cd94 |
+ kwargs['extras_require'] = {'SPARQLStore': 'SPARQLWrapper'}
|
|
|
cd0dee6 |
kwargs['tests_require'] = ['networkx']
|
|
|
499cd94 |
|
|
|
499cd94 |
if sys.version_info[1]<7: # Python 2.6
|
|
|
cd0dee6 |
diff --git a/test/test_dataset.py b/test/test_dataset.py
|
|
|
cd0dee6 |
index 4d39c3d..d12d054 100644
|
|
|
cd0dee6 |
--- a/test/test_dataset.py
|
|
|
cd0dee6 |
+++ b/test/test_dataset.py
|
|
|
cd0dee6 |
@@ -2,6 +2,12 @@ import sys
|
|
|
cd0dee6 |
import os
|
|
|
cd0dee6 |
import unittest
|
|
|
cd0dee6 |
|
|
|
cd0dee6 |
+try:
|
|
|
cd0dee6 |
+ import SPARQLWrapper
|
|
|
cd0dee6 |
+except ImportError:
|
|
|
cd0dee6 |
+ from nose.exc import SkipTest
|
|
|
cd0dee6 |
+ raise SkipTest("SPARQLWrapper not installed")
|
|
|
cd0dee6 |
+
|
|
|
cd0dee6 |
from tempfile import mkdtemp, mkstemp
|
|
|
cd0dee6 |
import shutil
|
|
|
cd0dee6 |
from rdflib import Graph, Dataset, URIRef, BNode, plugin
|
|
|
cd0dee6 |
diff --git a/test/test_issue457.py b/test/test_issue457.py
|
|
|
cd0dee6 |
index f9957db..8c6f491 100644
|
|
|
cd0dee6 |
--- a/test/test_issue457.py
|
|
|
cd0dee6 |
+++ b/test/test_issue457.py
|
|
|
cd0dee6 |
@@ -1,4 +1,9 @@
|
|
|
cd0dee6 |
# test for https://github.com/RDFLib/rdflib/issues/457
|
|
|
cd0dee6 |
+try:
|
|
|
cd0dee6 |
+ import SPARQLWrapper
|
|
|
cd0dee6 |
+except ImportError:
|
|
|
cd0dee6 |
+ from nose.exc import SkipTest
|
|
|
cd0dee6 |
+ raise SkipTest("SPARQLWrapper not installed")
|
|
|
cd0dee6 |
|
|
|
cd0dee6 |
import io
|
|
|
cd0dee6 |
from xml.etree import ElementTree
|