Improve requirements resolution.

2017-03-10 12:20:43 +01:00 · 2017-03-10 12:20:43 +01:00 · bf35ac253e
parent 8c119de997
commit bf35ac253e
4 changed files with 2 additions and 8 deletions
--- a/requirements-python-2.6.txt
+++ b/requirements-python-2.6.txt
@ -1,2 +0,0 @@
-JPype1==0.6.0
-unittest2==0.5.1
--- a/requirements-python-2.7.txt
+++ b/requirements-python-2.7.txt
@ -1,2 +0,0 @@
-JPype1==0.6.0
-unittest2==0.5.1
--- a/requirements-python-3.4.txt
+++ b/requirements-python-3.4.txt
@ -1 +0,0 @@
-JPype1==0.6.0
--- a/tox.ini
+++ b/tox.ini
@ -16,9 +16,8 @@ setenv =
  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
+  py: JPype1==0.6.2
+  py26: unittest2==0.5.1
  jip==0.9.10
 commands =
  python ci/jipconf_subst.py {envdir} {toxworkdir}/shared