Merge pull request #20 from adamhadani/feature/ah-unittest-runners

Clean up unit-test invocation with tox / Travis CI

Author: Adam Ever-Hadani

.travis.yml

@@ -1,9 +1,5 @@
 # http://travis-ci.org/#!/gjhiggins/rdflib-sqlalchemy
 language: python
-branches:
-  only:
-    - master
-    - idkey
 env:
     - DB=pgsql
     - DB=mysql
@@ -15,17 +11,9 @@ python:
     - 3.4
     - 3.5
 install:
-    - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '2' ]]; then pip install -r requirements-py2.txt; fi
-    - if [[ ${TRAVIS_PYTHON_VERSION%%.*} == '3' ]]; then pip install -r requirements-py3.txt; fi
-    - python setup.py install
+    - pip install -U setuptools tox tox-travis
 before_script:
   - 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' = '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 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
-
+script: tox

requirements-py2.txt

@@ -3,10 +3,9 @@ tag_build = .dev
 tag_date = false
 
 [nosetests]
-
 attr = !known_issue,!performancetest
 verbosity = 2
-#with-doctest = 1
-
-
 
+[flake8]
+max-line-length = 120
+max-complexity = 15

requirements-py3.txt

@@ -127,7 +127,6 @@ class GraphAggregates2(unittest.TestCase):
     def setUp(self):
         memStore = plugin.get('SQLAlchemy', Store)(
             identifier="rdflib_test", configuration=Literal("sqlite://"))
-        print("ASDF")
         self.graph1 = Graph(memStore, URIRef("http://example.com/graph1"))
         self.graph2 = Graph(memStore, URIRef("http://example.com/graph2"))
         self.graph3 = Graph(memStore, URIRef("http://example.com/graph3"))
@@ -137,9 +136,7 @@ def setUp(self):
                              (testGraph3N3, self.graph3)]:
             graph.parse(StringIO(n3Str), format='n3')
         self.graph4 = Graph(memStore, RDFS.uri)
-        print("ASDF B")
         self.graph4.parse(RDFS.uri)
-        print("ASDF C")
         self.G = ConjunctiveGraph(memStore)
 
     def testAggregateSPARQL(self):

setup.cfg

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py26,py27,cover,py34,py35
+    py26,py27,py34,py35,cover,lint
 
 [testenv]
 passenv = DB DBURI
@@ -10,7 +10,7 @@ commands =
 deps =
     nose
     psycopg2
-    MySQL-python
+    mysqlclient
 
 [testenv:py34]
 basepython = python3.4
@@ -22,7 +22,7 @@ deps =
     nose
     psycopg2
     http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip
-    git+https://github.com/PyMySQL/mysqlclient-python#egg=MySQLdb
+    mysqlclient
 
 [testenv:py35]
 basepython = python3.5
@@ -34,7 +34,14 @@ deps =
     nose
     psycopg2
     http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip
-    git+https://github.com/PyMySQL/mysqlclient-python#egg=MySQLdb
+    mysqlclient
+
+[testenv:lint]
+basepython = python3
+commands = flake8 rdflib_sqlalchemy test
+deps=
+    flake8
+    flake8-print
 
 [testenv:cover]
 basepython = python2.7
@@ -46,11 +53,8 @@ deps =
     nose
     coverage
     psycopg2
-    MySQL-python
-
-# we separate coverage into its own testenv because a) "last run wins" wrt
-# cobertura jenkins reporting and b) pypy and jython can't handle any
-# combination of versions of coverage and nosexcover that i can find.
-# coverage <3.4 is required by nosexcover 1.0.4.
+    mysqlclient
 
-# DB='pgsql' DBURI='postgresql+psycopg2://user:password@host/dbname' tox -e py32
+[tox:travis]
+2.7 = py27, cover, lint
+3.5 = py35, lint