From 760f44a21291776bc38be5bd561ce5f477afde03 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 9 Feb 2015 15:42:33 -0500 Subject: [PATCH 1/2] Add py33 to tox. Fixes #152. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 574c1218025e..64b6eb9da8ca 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py26,py27,py34,cover,docs,lint + py26,py27,py33,py34,cover,docs,lint [testenv:py26] commands = From a69c879c0f9b4304edc0f3bcb774328a77381972 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 9 Feb 2015 18:14:13 -0500 Subject: [PATCH 2/2] Drop fossilized '[testenv:py26]' tox environment. We are now 2.6-compatible in the default environment. --- tox.ini | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tox.ini b/tox.ini index 64b6eb9da8ca..13cb65bf8665 100644 --- a/tox.ini +++ b/tox.ini @@ -2,14 +2,6 @@ envlist = py26,py27,py33,py34,cover,docs,lint -[testenv:py26] -commands = - nosetests -deps = - nose - unittest2 - protobuf==3.0.0-alpha-1 - [testenv] install_command = {toxinidir}/scripts/custom_pip_install.sh {opts} {packages}