From bf35ac253e093477dae2d6f0a54e180485122530 Mon Sep 17 00:00:00 2001 From: baztian Date: Fri, 10 Mar 2017 12:20:43 +0100 Subject: [PATCH] Improve requirements resolution. --- requirements-python-2.6.txt | 2 -- requirements-python-2.7.txt | 2 -- requirements-python-3.4.txt | 1 - tox.ini | 5 ++--- 4 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 requirements-python-2.6.txt delete mode 100644 requirements-python-2.7.txt delete mode 100644 requirements-python-3.4.txt diff --git a/requirements-python-2.6.txt b/requirements-python-2.6.txt deleted file mode 100644 index da45555..0000000 --- a/requirements-python-2.6.txt +++ /dev/null @@ -1,2 +0,0 @@ -JPype1==0.6.0 -unittest2==0.5.1 diff --git a/requirements-python-2.7.txt b/requirements-python-2.7.txt deleted file mode 100644 index da45555..0000000 --- a/requirements-python-2.7.txt +++ /dev/null @@ -1,2 +0,0 @@ -JPype1==0.6.0 -unittest2==0.5.1 diff --git a/requirements-python-3.4.txt b/requirements-python-3.4.txt deleted file mode 100644 index 87a36b2..0000000 --- a/requirements-python-3.4.txt +++ /dev/null @@ -1 +0,0 @@ -JPype1==0.6.0 diff --git a/tox.ini b/tox.ini index 7eef594..b154357 100644 --- 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