Update dependencies

Author: Graham Higgins

.travis.yml

@@ -13,6 +13,7 @@ python:
     - "2.7"
     - "3.2"
     - "3.3"
+    - "3.4"
 install:
     - if [[ ${TRAVIS_PYTHON_VERSION} == '2.5' ]]; then pip install simplejson==2.0.9; fi
     - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then pip install -r requirements-py2.txt --use-mirrors; fi
@@ -29,3 +30,4 @@ script:
     # 2to3 version.
     - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then nosetests; fi
     - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '3' ]]; then nosetests --where=./build/src; fi
+    

README.md

@@ -12,6 +12,26 @@ scalability as most graphs will always have more rdf:type statements than others
 
 In addition, it persists namespace mappings in a separate table.
 
+Back-end persistence
+--------------------
+
+Back-end persistence is provided by SQLAlchemy.
+
+Tested dialects are:
+
+- SQLite, using the built-in Python driver or, for Python 2.5, pysqlite
+- MySQL, using the MySQLdb-python driver or, for Python 3, mysql-connector
+- PostgreSQL, using the psycopg2 driver
+
+pysqlite: https://pypi.python.org/pypi/pysqlite
+
+MySQLdb-python: https://pypi.python.org/pypi/MySQL-python
+
+mysql-connector: http://dev.mysql.com/doc/connector-python/en/connector-python.html
+
+psycopg2: https://pypi.python.org/pypi/psycopg2
+
+
 Development
 ===========
 Github repository: https://github.com/RDFLib/rdflib-sqlalchemy

rdflib_sqlalchemy/SQLAlchemy.py

@@ -855,7 +855,7 @@ class membership columns: member,klass,context termComb
 
         q = unionSELECT(selects, selectType=TRIPLE_SELECT_NO_ORDER)
         with self.engine.connect() as connection:
-            _logger.debug("Triples query : %s" % str(q))
+            # _logger.debug("Triples query : %s" % str(q))
             res = connection.execute(q)
             # TODO: False but it may have limitations on text column. Check
             # NOTE: SQLite does not support ORDER BY terms that aren't
@@ -980,7 +980,7 @@ def __len__(self, context=None):
                  ASSERTED_LITERAL_PARTITION), ]
             q = unionSELECT(selects, distinct=False, selectType=COUNT_SELECT)
 
-        _logger.debug("Length query : %s" % str(q))
+        # _logger.debug("Length query : %s" % str(q))
 
         with self.engine.connect() as connection:
             res = connection.execute(q)
@@ -1189,7 +1189,9 @@ def namespace(self, prefix):
                 res = connection.execute(s)
                 rt = [rtTuple[0] for rtTuple in res.fetchall()]
                 res.close()
-                return rt and rt[0] or None
+                # return rt and rt[0] or None
+                from rdflib import URIRef
+                return rt and URIRef(rt[0]) or None
         except:
             return None
 

requirements-py3.txt

@@ -1,4 +1,5 @@
 -e git+https://github.com/RDFLib/rdflib.git#egg=rdflib
 psycopg2
-http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-1.0.10.zip
-# -e git+https://github.com/davispuh/MySQL-for-Python-3#egg=MySQL-python
+# http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-1.0.10.zip
+http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.2.zip
+-e git+https://github.com/davispuh/MySQL-for-Python-3#egg=MySQL-python

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py25,py26,py27,cover,py32,py33
+    py25,py26,py27,cover,py32,py34
 
 [testenv]
 commands =
@@ -37,12 +37,10 @@ deps =
     git+http://github.com/RDFLib/rdflib#egg=rdflib
     SQLAlchemy
     psycopg2
-    http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-1.0.10.zip
-    # git+https://github.com/davispuh/MySQL-for-Python-3#egg=MySQL-python
-    # lxml
+    http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.2.zip
 
-[testenv:py33]
-basepython = python3.3
+[testenv:py34]
+basepython = python3.4
 commands =
     {envpython} setup.py clean --all
     {envpython} setup.py build
@@ -52,10 +50,8 @@ deps =
     git+http://github.com/RDFLib/rdflib#egg=rdflib
     SQLAlchemy
     psycopg2
-    http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-1.0.10.zip
-    # git+https://github.com/davispuh/MySQL-for-Python-3#egg=MySQL-python
-    # oursql
-    # lxml
+    http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.2.zip
+    git+https://github.com/PyMySQL/mysqlclient-python#egg=MySQLdb
 
 [testenv:cover]
 basepython = python2.7