Update phase 1

Author: gjhiggins

.gitignore

@@ -1,7 +1,9 @@
 .tox
 .noseids
 rdflib_sqlalchemy.egg-info
-.eggs/
-__pycache__/
+/build/
 *.pyc
-build/
+/__pycache__/
+*.project
+*.pydevproject
+/.eggs/

.travis.yml

@@ -8,23 +8,23 @@ env:
     - DB=mysql
     - DB=sqlite
 python:
-    - "2.6"
-    - "2.7"
-    - "3.3"
-    - "3.4"
+    - 2.6
+    - 2.7
+    - 3.3
+    - 3.4
+    - 3.5
 install:
     - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then pip install -r requirements-py2.txt --use-mirrors; fi
     - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '3' ]]; then pip install -r requirements-py3.txt --use-mirrors; fi
-    - if [[ ${TRAVIS_PYTHON_VERSION} == 'pypy' ]]; then pip install --upgrade 'git+https://github.com/gjhiggins/isodate#egg=isodate'; fi
     - python setup.py install
 before_script:
-  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS rdflibsqla_test;' -U postgres; fi"
-  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database rdflibsqla_test;' -U postgres; fi"
-  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS rdflibsqla_test'; fi"
+  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS test;' -U postgres; psql -c 'create database test;' -U postgres; export DBURI='postgresql+psycopg2://postgres@localhost/test'; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS test'; export DBURI='mysql+mysqldb://test@localhost/test?charset=utf8'; fi"
+  - sh -c "if [ '$DB' = 'sqlite' ]; then export DBURI='sqlite:///%(here)s/test.sqlite'; fi"
 script:
     # Must cd somewhere else so python3 doesn't get confused and run
     # the python2 code from the current directory instead of the installed
     # 2to3 version.
-    - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then nosetests; fi
-    - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '3' ]]; then nosetests --where=./build/src; fi
-    
+    - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then PYTHONWARNINGS=default nosetests --with-coverage --cover-tests --cover-package=rdflib_sqlalchemy ; fi
+    - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '3' ]]; then PYTHONWARNINGS=default nosetests --with-coverage --cover-tests --cover-package=build/src/rdflib_sqlalchemy --where=./build/src; fi
+

rdflib_sqlalchemy/termutils.py

@@ -90,10 +90,10 @@ def normalizeGraph(graph):
     (rdflib.term.URIRef(%(u)s'http://purl.org/net/bel-epa/gjh'), 'U')
     >>> g = ConjunctiveGraph(memstore, Namespace("http://rdflib.net/ns"))
     >>> normalizeGraph(g)  #doctest: +ELLIPSIS
-    (Namespace(%(u)s'http://rdflib.net/ns'), 'U')
+    (rdflib.term.URIRef(%(u)s'http://rdflib.net/ns'), 'U')
     >>> g = QuotedGraph(memstore, Namespace("http://rdflib.net/ns"))
     >>> normalizeGraph(g)
-    (Namespace(%(u)s'http://rdflib.net/ns'), 'F')
+    (rdflib.term.URIRef(%(u)s'http://rdflib.net/ns'), 'F')
 
     """
     if isinstance(graph, QuotedGraph):

requirements-py2.txt

@@ -1,3 +1,3 @@
--e git+https://github.com/RDFLib/rdflib.git#egg=rdflib
+coverage
 psycopg2
 MySQL-python

requirements-py3.txt

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

setup.py

@@ -1,19 +1,21 @@
 #!/usr/bin/env python
+"""Setup."""
 # -*- coding: utf-8 -*-
 import sys
 import re
 
 
 def setup_python3():
-    # Taken from "distribute" setup.py
+    """Taken from "distribute" setup.py."""
     from distutils.filelist import FileList
-    from distutils import dir_util, file_util, util, log
+    from distutils import dir_util, file_util, util
     from os.path import join, exists
 
     tmp_src = join("build", "src")
+    # Not covered by "setup.py clean --all", so explicit deletion required.
     if exists(tmp_src):
         dir_util.remove_tree(tmp_src)
-    log.set_verbosity(1)
+    # log.set_verbosity(1)
     fl = FileList()
     for line in open("MANIFEST.in"):
         if not line.strip():
@@ -33,10 +35,33 @@ def setup_python3():
 
     return tmp_src
 
+kwargs = {}
+if sys.version_info[0] >= 3:
+    from setuptools import setup
+    # kwargs['use_2to3'] = True  # is done in setup_python3 above already
+    kwargs['install_requires'] = ["rdflib>=4.0", "SQLAlchemy"]
+    kwargs['tests_require'] = ['coveralls']
+    kwargs['requires'] = []
+    kwargs['src_root'] = setup_python3()
+    assert setup
+else:
+    try:
+        from setuptools import setup
+        assert setup
+        kwargs['test_suite'] = "nose.collector"
+        kwargs['install_requires'] = ["rdflib>=4.0", "SQLAlchemy"]
+        kwargs['tests_require'] = ['coveralls']
+
+    except ImportError:
+        from distutils.core import setup
+
 
-# Find version. We have to do this because we can't import it in Python 3 until
-# its been automatically converted in the setup process.
 def find_version(filename):
+    """Find version.
+
+    We have to do this because we can't import it in Python 3 until
+    its been automatically converted in the setup process.
+    """
     _version_re = re.compile(r'__version__ = "(.*)"')
     for line in open(filename):
         version_match = _version_re.match(line)
@@ -45,7 +70,7 @@ def find_version(filename):
 
 __version__ = find_version('rdflib_sqlalchemy/__init__.py')
 
-config = dict(
+setup(
     name='rdflib-sqlalchemy',
     version=__version__,
     description="rdflib extension adding SQLAlchemy as an AbstractSQLStore back-end store",
@@ -73,42 +98,21 @@ def find_version(filename):
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 2.5",
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.2",
         "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
         "License :: OSI Approved :: BSD License",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Operating System :: OS Independent",
         "Natural Language :: English",
-        ],
-    test_suite="test",
+    ],
     entry_points={
         'rdf.plugins.store': [
-            'SQLAlchemy = rdflib_sqlalchemy.SQLAlchemy:SQLAlchemy',
+            # 'SQLAlchemy = rdflib_sqlalchemy.SQLAlchemy:SQLAlchemy',
             # 'SQLAlchemyBase = rdflib_sqlalchemy.SQLAlchemyBase:SQLAlchemy',
         ],
-    }
+    },
+    **kwargs
 )
-
-install_requires = ["rdflib>=4.0",
-                    "SQLAlchemy"]
-
-if sys.version_info[0] >= 3:
-    from setuptools import setup
-    assert setup
-    config.update({'use_2to3': True})
-    config.update({'src_root': setup_python3()})
-else:
-    if sys.version_info[:2] < (2, 6):
-        install_requires += ['pysqlite']
-    try:
-        from setuptools import setup
-        assert setup
-        config.update({'test_suite': "nose.collector"})
-    except ImportError:
-        from distutils.core import setup
-
-config['install_requires'] = install_requires
-setup(**config)

test/test_sqlalchemy_mysql.py

@@ -27,7 +27,7 @@
 # Specific to Travis-ci continuous integration and testing ...
 sqlalchemy_url = Literal(os.environ.get(
     'DBURI',
-    "mysql+%s://[email protected]:3306/rdflibsqla_test?charset=utf8" % dialect))
+    "mysql+%s://[email protected]:3306/test?charset=utf8" % dialect))
 # Generally ...
 # sqlalchemy_url = Literal(
 #    "mysql+mysqldb://user:password@hostname:port/database?charset=utf8")

test/test_sqlalchemy_postgresql.py

@@ -14,7 +14,7 @@
 
 sqlalchemy_url = os.environ.get(
     'DBURI',
-    'postgresql+psycopg2://postgres@localhost/rdflibsqla_test')
+    'postgresql+psycopg2://postgres@localhost/test')
 
 
 class SQLAPgSQLGraphTestCase(graph_case.GraphTestCase):

test/test_store_performance.py

@@ -1,3 +1,4 @@
+"""Store performance tests."""
 import unittest
 import gc
 import os
@@ -7,34 +8,46 @@
 from tempfile import mkdtemp
 from rdflib import Graph
 from rdflib import URIRef
+try:
+    from urllib.request import pathname2url
+except:
+    from urllib import pathname2url
+from nose import SkipTest
+
+raise SkipTest("Store performance test suspended")
 
 
 def random_uri():
+    """Return random URI."""
     return URIRef("%s" % random())
 
 
 class StoreTestCase(unittest.TestCase):
     """
-    Test case for testing store performance... probably should be
-    something other than a unit test... but for now we'll add it as a
-    unit test.
+    Test case for testing store performance.
+
+    Probably should be something other than a unit test
+    but for now we'll add it as a unit test.
     """
+
     store = 'IOMemory'
     path = None
     storetest = True
     performancetest = True
 
     def setUp(self):
+        """Setup."""
         self.gcold = gc.isenabled()
         gc.collect()
         gc.disable()
-
         self.graph = Graph(store=self.store)
-        self.tmppath = mkdtemp()
-        self.graph.open(self.tmppath)
+        if self.path is None:
+            self.path = pathname2url(mkdtemp())
+        self.graph.open(self.path)
         self.input = Graph()
 
     def tearDown(self):
+        """Teardown."""
         self.graph.close()
         if self.gcold:
             gc.enable()
@@ -53,6 +66,7 @@ def tearDown(self):
                     os.remove(self.path)
 
     def testTime(self):
+        """Test timing."""
         # number = 1
         print('"%s": [' % self.store)
         for i in ['500triples', '1ktriples', '2ktriples',
@@ -80,9 +94,12 @@ def add_from_input():
 
 
 class SQLAlchemyStoreTestCase(StoreTestCase):
+    """SQLAlchemy Store."""
+
     store = "SQLAlchemy"
 
     def setUp(self):
+        """Setup."""
         self.store = "SQLAlchemy"
         self.path = "sqlite:///%(here)s/test/tmpdb.sqlite" % {
             "here": os.getcwd()}

tox.ini

@@ -1,45 +1,39 @@
 [tox]
 envlist =
-    py26,py27,cover,py33,py34
+    py26,py27,cover,py34,py35
 
 [testenv]
+passenv = DB DBURI
 commands =
     {envpython} setup.py clean --all
     {envpython} setup.py nosetests
 deps =
     nose
-    git+http://github.com/RDFLib/rdflib#egg=rdflib
-    SQLAlchemy
     psycopg2
     MySQL-python
 
-
-[testenv:py33]
-basepython = python3.3
+[testenv:py34]
+basepython = python3.4
 commands =
     {envpython} setup.py clean --all
     {envpython} setup.py build
-    nosetests --where=./build/src
+    {envpython} setup.py nosetests --where=./build/src
 deps =
     nose
-    git+http://github.com/RDFLib/rdflib#egg=rdflib
-    SQLAlchemy
     psycopg2
-    http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.2.zip
+    http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip
     git+https://github.com/PyMySQL/mysqlclient-python#egg=MySQLdb
 
-[testenv:py34]
-basepython = python3.4
+[testenv:py35]
+basepython = python3.5
 commands =
     {envpython} setup.py clean --all
     {envpython} setup.py build
-    nosetests --where=./build/src
+    {envpython} setup.py nosetests --where=./build/src
 deps =
     nose
-    git+http://github.com/RDFLib/rdflib#egg=rdflib
-    SQLAlchemy
     psycopg2
-    http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.2.zip
+    http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip
     git+https://github.com/PyMySQL/mysqlclient-python#egg=MySQLdb
 
 [testenv:cover]
@@ -51,8 +45,6 @@ commands =
 deps =
     nose
     coverage
-    git+http://github.com/RDFLib/rdflib#egg=rdflib
-    SQLAlchemy
     psycopg2
     MySQL-python