From 136057d3563f3fe5808c543bbba81eebf4aa4b6a Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Sun, 5 Mar 2017 22:38:28 +0100
Subject: [PATCH 01/15] Use tox to support a build matrix. (Add Jython support
 later)

---
 .gitignore | 13 ++++++++-----
 tox.ini    | 22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 tox.ini

diff --git a/.gitignore b/.gitignore
index d401490..0c1bb25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 *.pyc
 /README*.html
 *.class
-/build
-/dist
+build/
+dist/
 .ropeproject/globalnames
 .ropeproject/history
 .ropeproject/objectdb
@@ -11,6 +11,9 @@
 mem.*
 *.log
 JayDeBeApi.egg-info
-/mockdriver/target
-/mockdriver/.classpath
-/mockdriver/.project
+target/
+.classpath
+.project
+.tox
+*.iml
+.idea/
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..bfca108
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,22 @@
+[tox]
+envlist = py{27,35}-driver-{hsqldb,mock,sqliteXerial},py27-driver-sqlitePy
+[testenv]
+# Should be changed to {toxinidir} once i manage to download javalibs in tox
+setenv = CLASSPATH = {envdir}/javalib/*
+  driver-mock: TESTNAME=test_mock
+  driver-hsqldb: TESTNAME=test_integration.HsqldbTest
+  driver-sqliteXerial: TESTNAME=test_integration.SqliteXerialTest
+  driver-sqlitePy: TESTNAME=test_integration.SqlitePyTest
+#deps=pytest       # install pytest in the venvs
+deps =
+  py27: -rrequirements-python-2.7.txt
+  py35: -rrequirements-python-3.4.txt
+  jip==0.9.3
+commands =
+# Should be changed to {toxinidir} once i manage to download javalibs in tox
+  bash -c \'envsubst < ci/dot_jip > {envdir}/.jip\'
+  driver-hsqldb:  jip install org.hsqldb:hsqldb:1.8.0.10
+  driver-sqliteXerial:  jip install org.xerial:sqlite-jdbc:3.7.2
+  driver-mock: mvn -f mockdriver/pom.xml install
+  driver-mock: jip install org.jaydebeapi:mockdriver:1.0-SNAPSHOT
+  {envbindir}/python test/testsuite.py {env:TESTNAME}

From 6a9795cdd9cac71900428b30c5c101f718dbff23 Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Sun, 5 Mar 2017 22:56:22 +0100
Subject: [PATCH 02/15] Add Jython support for mock driver test to tox build
 matrix.

---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index bfca108..f7f4cf4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,35}-driver-{hsqldb,mock,sqliteXerial},py27-driver-sqlitePy
+envlist = py{27,35}-driver-{hsqldb,mock,sqliteXerial},py27-driver-sqlitePy,jython-driver-mock
 [testenv]
 # Should be changed to {toxinidir} once i manage to download javalibs in tox
 setenv = CLASSPATH = {envdir}/javalib/*
@@ -7,10 +7,10 @@ setenv = CLASSPATH = {envdir}/javalib/*
   driver-hsqldb: TESTNAME=test_integration.HsqldbTest
   driver-sqliteXerial: TESTNAME=test_integration.SqliteXerialTest
   driver-sqlitePy: TESTNAME=test_integration.SqlitePyTest
-#deps=pytest       # install pytest in the venvs
 deps =
   py27: -rrequirements-python-2.7.txt
   py35: -rrequirements-python-3.4.txt
+# not required for jython >= 2.7 anymore  jython: -rrequirements-jython.txt
   jip==0.9.3
 commands =
 # Should be changed to {toxinidir} once i manage to download javalibs in tox

From 4666f606d9aae629236d412f1744a87a4bf05400 Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Sun, 5 Mar 2017 22:59:26 +0100
Subject: [PATCH 03/15] Add Jython support for hsqldb driver test to tox build
 matrix.

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index f7f4cf4..04612c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,35}-driver-{hsqldb,mock,sqliteXerial},py27-driver-sqlitePy,jython-driver-mock
+envlist = py{27,35}-driver-{hsqldb,mock,sqliteXerial},py27-driver-sqlitePy,jython-driver-{hsqldb,mock}
 [testenv]
 # Should be changed to {toxinidir} once i manage to download javalibs in tox
 setenv = CLASSPATH = {envdir}/javalib/*

From bc732dca08c07f009e63cd893aa3d8cedd74a5ab Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Tue, 7 Mar 2017 14:27:03 +0100
Subject: [PATCH 04/15] Improve tox configuration.

---
 .gitignore             |  1 +
 README_development.rst | 30 +++++++++++++++++-------------
 dev-requirements.txt   |  5 +++--
 jipconf_subst.py       | 15 +++++++++++++++
 tox.ini                |  5 +++--
 5 files changed, 39 insertions(+), 17 deletions(-)
 create mode 100644 jipconf_subst.py

diff --git a/.gitignore b/.gitignore
index 0c1bb25..b7ab98b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.class
 build/
 dist/
+env/
 .ropeproject/globalnames
 .ropeproject/history
 .ropeproject/objectdb
diff --git a/README_development.rst b/README_development.rst
index 04417bd..20a7aa5 100644
--- a/README_development.rst
+++ b/README_development.rst
@@ -10,21 +10,25 @@ Setup test requirements
 =======================
 
 ::
-    sudo apt-get install python2.7-dev g++ maven
-    cd mockdriver
-    mvn install
+    sudo apt-get install python2.7-dev python3-dev python3-venv g++ maven
+    cd <JAYDEBEAPI_WORKDIR>
+    python3 -m venv env
+    . env/bin/activate
+    pip install -rdev-requirements.txt
 
-    virtualenv ~/.virtualenvs/jaydebeapi-py27 -p /usr/bin/python2.7
-    . ~/.virtualenvs/jaydebeapi-py27/bin/activate
-    pip install -r dev-requirements.txt -r requirements-python-2.7.txt jip==0.9.9
-    envsubst < ci/dot_jip > $VIRTUAL_ENV/.jip
-    jip install org.jaydebeapi:mockdriver:1.0-SNAPSHOT
-    jip install org.hsqldb:hsqldb:1.8.0.10
-    jip install org.xerial:sqlite-jdbc:3.7.2
+    # Install Jython 2.7
+    ci/mvnget.sh org.python:jython-installer:2.7.0
+    java -jar jython-installer-2.7.0.jar && rm jython-installer-2.7.0.jar
+    # add jython to your path
+
+    # run tests for all supported envs
+    tox
+
+    # activate and work on specific env
+    . .tox/py35-driver-mock/bin/activate
     export CLASSPATH=$VIRTUAL_ENV/javalib/*
-    python setup.py develop
     python test/testsuite.py
-
+   
 Build a new release
 ===================
 
@@ -50,7 +54,7 @@ Build a new release
 
 7. Run setuptools to ensure everything is working as expected. ::
 
-     $ python setup.py sdist bdist_wheel upload
+     $ python setup.py sdist bdist_wheel upload -r pypitest
 
 8. Check the files in ``dist/`` for unwanted or missing files.
 
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 70e1c5e..33007ba 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,2 +1,3 @@
-wheel==0.24.0
-bumpversion==0.5.1
+tox==2.6.0
+wheel==0.29.0
+bumpversion==0.5.3
diff --git a/jipconf_subst.py b/jipconf_subst.py
new file mode 100644
index 0000000..b3621ba
--- /dev/null
+++ b/jipconf_subst.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+from __future__ import print_function
+from os import path
+import sys
+
+home=sys.argv[1]
+with open(path.join(home, '.jip'), "w") as out:
+    print("""[repos:local]
+uri={0}/.m2/repository/
+type=local
+
+[repos:central]
+uri=http://repo1.maven.org/maven2/
+type=remote
+""".format(home), file=out)
diff --git a/tox.ini b/tox.ini
index 04612c7..2cdafa3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 envlist = py{27,35}-driver-{hsqldb,mock,sqliteXerial},py27-driver-sqlitePy,jython-driver-{hsqldb,mock}
 [testenv]
+whitelist_externals = mvn
 # Should be changed to {toxinidir} once i manage to download javalibs in tox
 setenv = CLASSPATH = {envdir}/javalib/*
   driver-mock: TESTNAME=test_mock
@@ -14,9 +15,9 @@ deps =
   jip==0.9.3
 commands =
 # Should be changed to {toxinidir} once i manage to download javalibs in tox
-  bash -c \'envsubst < ci/dot_jip > {envdir}/.jip\'
+  python jipconf_subst.py {envdir}
   driver-hsqldb:  jip install org.hsqldb:hsqldb:1.8.0.10
   driver-sqliteXerial:  jip install org.xerial:sqlite-jdbc:3.7.2
-  driver-mock: mvn -f mockdriver/pom.xml install
+  driver-mock: mvn -Dmaven.repo.local={distdir}/.m2/repository -f mockdriver/pom.xml install
   driver-mock: jip install org.jaydebeapi:mockdriver:1.0-SNAPSHOT
   {envbindir}/python test/testsuite.py {env:TESTNAME}

From 85f528aa4cb00e17a56185c315dc1700f118ab0b Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Tue, 7 Mar 2017 14:32:35 +0100
Subject: [PATCH 05/15] Align .travis.yml to tox related changes.

---
 .travis.yml | 2 +-
 ci/dot_jip  | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 ci/dot_jip

diff --git a/.travis.yml b/.travis.yml
index d320394..bd30482 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ before_install:
 
 install:
   - if [ "$JDBC_DRIVER" == "org.jaydebeapi:mockdriver:1.0-SNAPSHOT" ]; then (cd mockdriver && mvn install) ;fi
-  - if [ -n "$JDBC_DRIVER" ]; then envsubst < ci/dot_jip > $VIRTUAL_ENV/.jip && pip install jip==0.9.3 && jip install $JDBC_DRIVER && export CLASSPATH=$VIRTUAL_ENV/javalib/* ;fi # TODO: Fix jip to search for local maven repo without twaking .jip
+  - if [ -n "$JDBC_DRIVER" ]; then python jipconf_subst.py $VIRTUAL_ENV && pip install jip==0.9.3 && jip install $JDBC_DRIVER && export CLASSPATH=$VIRTUAL_ENV/javalib/* ;fi # TODO: Fix jip to search for local maven repo without twaking .jip
   - source $HOME/myvirtualenv/bin/activate
   - pip install -e .
   - if [ -z "$JYTHON" ]; then pip install coveralls ;fi
diff --git a/ci/dot_jip b/ci/dot_jip
deleted file mode 100644
index 8f5cf39..0000000
--- a/ci/dot_jip
+++ /dev/null
@@ -1,7 +0,0 @@
-[repos:local]
-uri=$HOME/.m2/repository/
-type=local
-
-[repos:central]
-uri=http://repo1.maven.org/maven2/
-type=remote

From aaa118b6b9086062ad4af04647cf2288a2437f8b Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Tue, 7 Mar 2017 16:44:55 +0100
Subject: [PATCH 06/15] Fixed travis mvn call.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bd30482..5f5db34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ before_install:
   - ci/before_install.sh
 
 install:
-  - if [ "$JDBC_DRIVER" == "org.jaydebeapi:mockdriver:1.0-SNAPSHOT" ]; then (cd mockdriver && mvn install) ;fi
+  - if [ "$JDBC_DRIVER" == "org.jaydebeapi:mockdriver:1.0-SNAPSHOT" ]; then (cd mockdriver && mvn -Dmaven.repo.local=$VIRTUAL_ENV/.m2/repository install) ;fi
   - if [ -n "$JDBC_DRIVER" ]; then python jipconf_subst.py $VIRTUAL_ENV && pip install jip==0.9.3 && jip install $JDBC_DRIVER && export CLASSPATH=$VIRTUAL_ENV/javalib/* ;fi # TODO: Fix jip to search for local maven repo without twaking .jip
   - source $HOME/myvirtualenv/bin/activate
   - pip install -e .

From c75060afaa360159f98445373b1933459cc2d704 Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Tue, 7 Mar 2017 20:16:20 +0100
Subject: [PATCH 07/15] Make mvnget.sh Python 3 compatible.

---
 ci/mvnget.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/mvnget.sh b/ci/mvnget.sh
index fcfba92..a7ad631 100755
--- a/ci/mvnget.sh
+++ b/ci/mvnget.sh
@@ -4,7 +4,7 @@ set -e
 ARTIFACT_SPEC=$1
 GROUP_ID=${ARTIFACT_SPEC%%:*}
 NON_GROUP_ID=${ARTIFACT_SPEC#*:}
-ARTIFACT_NAME=`python -c "import re;print re.search(r':(.*):', '$ARTIFACT_SPEC').group(1)"`
+ARTIFACT_NAME=`python -c "import re;print(re.search(r':(.*):', '$ARTIFACT_SPEC').group(1))"`
 _PATH=${GROUP_ID/./\/}/$ARTIFACT_NAME
 _ARTIFACT_SPEC_BASENAME=${NON_GROUP_ID/:/-}
 VERSION=${ARTIFACT_SPEC##*:}

From 2e3d8ce1a8607576d9c02ca384eb91810d7bba68 Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Tue, 7 Mar 2017 20:17:37 +0100
Subject: [PATCH 08/15] Make tox work with any Python 3 release. Fix maven repo
 reference.

---
 tox.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tox.ini b/tox.ini
index 2cdafa3..a5d8b67 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,35}-driver-{hsqldb,mock,sqliteXerial},py27-driver-sqlitePy,jython-driver-{hsqldb,mock}
+envlist = py{27,3}-driver-{hsqldb,mock,sqliteXerial},py27-driver-sqlitePy,jython-driver-{hsqldb,mock}
 [testenv]
 whitelist_externals = mvn
 # Should be changed to {toxinidir} once i manage to download javalibs in tox
@@ -10,12 +10,12 @@ setenv = CLASSPATH = {envdir}/javalib/*
   driver-sqlitePy: TESTNAME=test_integration.SqlitePyTest
 deps =
   py27: -rrequirements-python-2.7.txt
-  py35: -rrequirements-python-3.4.txt
+  py3: -rrequirements-python-3.4.txt
 # not required for jython >= 2.7 anymore  jython: -rrequirements-jython.txt
   jip==0.9.3
 commands =
 # Should be changed to {toxinidir} once i manage to download javalibs in tox
-  python jipconf_subst.py {envdir}
+  python jipconf_subst.py {distdir}
   driver-hsqldb:  jip install org.hsqldb:hsqldb:1.8.0.10
   driver-sqliteXerial:  jip install org.xerial:sqlite-jdbc:3.7.2
   driver-mock: mvn -Dmaven.repo.local={distdir}/.m2/repository -f mockdriver/pom.xml install

From 72dbb832d942fab7b8e59a3561ad3842fea96025 Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Tue, 7 Mar 2017 20:34:31 +0100
Subject: [PATCH 09/15] Fix maven repo access again.

---
 .travis.yml                             | 2 +-
 jipconf_subst.py => ci/jipconf_subst.py | 3 ++-
 tox.ini                                 | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename jipconf_subst.py => ci/jipconf_subst.py (86%)

diff --git a/.travis.yml b/.travis.yml
index 5f5db34..c81e42a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ before_install:
 
 install:
   - if [ "$JDBC_DRIVER" == "org.jaydebeapi:mockdriver:1.0-SNAPSHOT" ]; then (cd mockdriver && mvn -Dmaven.repo.local=$VIRTUAL_ENV/.m2/repository install) ;fi
-  - if [ -n "$JDBC_DRIVER" ]; then python jipconf_subst.py $VIRTUAL_ENV && pip install jip==0.9.3 && jip install $JDBC_DRIVER && export CLASSPATH=$VIRTUAL_ENV/javalib/* ;fi # TODO: Fix jip to search for local maven repo without twaking .jip
+  - if [ -n "$JDBC_DRIVER" ]; then python ci/jipconf_subst.py $VIRTUAL_ENV $VIRTUAL_ENV && pip install jip==0.9.3 && jip install $JDBC_DRIVER && export CLASSPATH=$VIRTUAL_ENV/javalib/* ;fi # TODO: Fix jip to search for local maven repo without twaking .jip
   - source $HOME/myvirtualenv/bin/activate
   - pip install -e .
   - if [ -z "$JYTHON" ]; then pip install coveralls ;fi
diff --git a/jipconf_subst.py b/ci/jipconf_subst.py
similarity index 86%
rename from jipconf_subst.py
rename to ci/jipconf_subst.py
index b3621ba..f7caaa7 100644
--- a/jipconf_subst.py
+++ b/ci/jipconf_subst.py
@@ -4,6 +4,7 @@ from os import path
 import sys
 
 home=sys.argv[1]
+dist=sys.argv[2]
 with open(path.join(home, '.jip'), "w") as out:
     print("""[repos:local]
 uri={0}/.m2/repository/
@@ -12,4 +13,4 @@ type=local
 [repos:central]
 uri=http://repo1.maven.org/maven2/
 type=remote
-""".format(home), file=out)
+""".format(dist), file=out)
diff --git a/tox.ini b/tox.ini
index a5d8b67..f66ef64 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ deps =
   jip==0.9.3
 commands =
 # Should be changed to {toxinidir} once i manage to download javalibs in tox
-  python jipconf_subst.py {distdir}
+  python ci/jipconf_subst.py {envdir} {distdir}
   driver-hsqldb:  jip install org.hsqldb:hsqldb:1.8.0.10
   driver-sqliteXerial:  jip install org.xerial:sqlite-jdbc:3.7.2
   driver-mock: mvn -Dmaven.repo.local={distdir}/.m2/repository -f mockdriver/pom.xml install

From 0596d5fbcab5124b0ec51e5ef230e17e03565366 Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Wed, 8 Mar 2017 11:29:21 +0100
Subject: [PATCH 10/15] Fix maven repo access again.

---
 ci/jipconf_subst.py | 2 +-
 tox.ini             | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/jipconf_subst.py b/ci/jipconf_subst.py
index f7caaa7..b3cf5ea 100644
--- a/ci/jipconf_subst.py
+++ b/ci/jipconf_subst.py
@@ -5,7 +5,7 @@ import sys
 
 home=sys.argv[1]
 dist=sys.argv[2]
-with open(path.join(home, '.jip'), "w") as out:
+with open(path.join(home, '.jip_config'), "w") as out:
     print("""[repos:local]
 uri={0}/.m2/repository/
 type=local
diff --git a/tox.ini b/tox.ini
index f66ef64..b8b477e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,12 +12,12 @@ deps =
   py27: -rrequirements-python-2.7.txt
   py3: -rrequirements-python-3.4.txt
 # not required for jython >= 2.7 anymore  jython: -rrequirements-jython.txt
-  jip==0.9.3
+  jip==0.9.9
 commands =
 # Should be changed to {toxinidir} once i manage to download javalibs in tox
-  python ci/jipconf_subst.py {envdir} {distdir}
+  python ci/jipconf_subst.py {envdir} {toxworkdir}/shared
   driver-hsqldb:  jip install org.hsqldb:hsqldb:1.8.0.10
   driver-sqliteXerial:  jip install org.xerial:sqlite-jdbc:3.7.2
-  driver-mock: mvn -Dmaven.repo.local={distdir}/.m2/repository -f mockdriver/pom.xml install
+  driver-mock: mvn -Dmaven.repo.local={toxworkdir}/shared/.m2/repository -f mockdriver/pom.xml install
   driver-mock: jip install org.jaydebeapi:mockdriver:1.0-SNAPSHOT
   {envbindir}/python test/testsuite.py {env:TESTNAME}

From c16e56c4868b2f65f514b807f69f390b78764f53 Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Wed, 8 Mar 2017 12:19:31 +0100
Subject: [PATCH 11/15] Upgrade jip to fix .jip_config not being found.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c81e42a..630f2ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ before_install:
 
 install:
   - if [ "$JDBC_DRIVER" == "org.jaydebeapi:mockdriver:1.0-SNAPSHOT" ]; then (cd mockdriver && mvn -Dmaven.repo.local=$VIRTUAL_ENV/.m2/repository install) ;fi
-  - if [ -n "$JDBC_DRIVER" ]; then python ci/jipconf_subst.py $VIRTUAL_ENV $VIRTUAL_ENV && pip install jip==0.9.3 && jip install $JDBC_DRIVER && export CLASSPATH=$VIRTUAL_ENV/javalib/* ;fi # TODO: Fix jip to search for local maven repo without twaking .jip
+  - if [ -n "$JDBC_DRIVER" ]; then python ci/jipconf_subst.py $VIRTUAL_ENV $VIRTUAL_ENV && pip install jip==0.9.9 && jip install $JDBC_DRIVER && export CLASSPATH=$VIRTUAL_ENV/javalib/* ;fi # TODO: Fix jip to search for local maven repo without twaking .jip
   - source $HOME/myvirtualenv/bin/activate
   - pip install -e .
   - if [ -z "$JYTHON" ]; then pip install coveralls ;fi

From 3676b42cfd2c4255179bbde6e76ca4e0128c9dbf Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Wed, 8 Mar 2017 12:26:48 +0100
Subject: [PATCH 12/15] Run doctests in tox.

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index b8b477e..36dcbcb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,3 +21,4 @@ commands =
   driver-mock: mvn -Dmaven.repo.local={toxworkdir}/shared/.m2/repository -f mockdriver/pom.xml install
   driver-mock: jip install org.jaydebeapi:mockdriver:1.0-SNAPSHOT
   {envbindir}/python test/testsuite.py {env:TESTNAME}
+  driver-hsqldb: {envbindir}/python test/doctests.py

From 82b0f14b60bd3c60d4903e16b6167938c13000be Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Wed, 8 Mar 2017 14:07:05 +0100
Subject: [PATCH 13/15] Fix whitespace

---
 README_development.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README_development.rst b/README_development.rst
index 20a7aa5..86bfb81 100644
--- a/README_development.rst
+++ b/README_development.rst
@@ -28,7 +28,7 @@ Setup test requirements
     . .tox/py35-driver-mock/bin/activate
     export CLASSPATH=$VIRTUAL_ENV/javalib/*
     python test/testsuite.py
-   
+
 Build a new release
 ===================
 

From ca9e978fe5c7988b1398954178ed4e84eb75b2ac Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Wed, 8 Mar 2017 14:16:35 +0100
Subject: [PATCH 14/15] Remove obsolete comments.

---
 tox.ini | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 36dcbcb..dcdd0b9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,6 @@
 envlist = py{27,3}-driver-{hsqldb,mock,sqliteXerial},py27-driver-sqlitePy,jython-driver-{hsqldb,mock}
 [testenv]
 whitelist_externals = mvn
-# Should be changed to {toxinidir} once i manage to download javalibs in tox
 setenv = CLASSPATH = {envdir}/javalib/*
   driver-mock: TESTNAME=test_mock
   driver-hsqldb: TESTNAME=test_integration.HsqldbTest
@@ -14,7 +13,6 @@ deps =
 # not required for jython >= 2.7 anymore  jython: -rrequirements-jython.txt
   jip==0.9.9
 commands =
-# Should be changed to {toxinidir} once i manage to download javalibs in tox
   python ci/jipconf_subst.py {envdir} {toxworkdir}/shared
   driver-hsqldb:  jip install org.hsqldb:hsqldb:1.8.0.10
   driver-sqliteXerial:  jip install org.xerial:sqlite-jdbc:3.7.2

From dc7b55085d4e197c166d819a9c132cc60489f81c Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Wed, 8 Mar 2017 14:28:52 +0100
Subject: [PATCH 15/15] Align tox matrix to travis matrix.

---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index dcdd0b9..61bccad 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,3}-driver-{hsqldb,mock,sqliteXerial},py27-driver-sqlitePy,jython-driver-{hsqldb,mock}
+envlist = py{26,27,3}-driver-{hsqldb,mock,sqliteXerial},py27-driver-sqlitePy,jython-driver-{hsqldb,mock}
 [testenv]
 whitelist_externals = mvn
 setenv = CLASSPATH = {envdir}/javalib/*
@@ -8,6 +8,7 @@ setenv = CLASSPATH = {envdir}/javalib/*
   driver-sqliteXerial: TESTNAME=test_integration.SqliteXerialTest
   driver-sqlitePy: TESTNAME=test_integration.SqlitePyTest
 deps =
+  py26: -rrequirements-python-2.6.txt
   py27: -rrequirements-python-2.7.txt
   py3: -rrequirements-python-3.4.txt
 # not required for jython >= 2.7 anymore  jython: -rrequirements-jython.txt