simple tox config; remove pypy from travis - lxml install fail

3 files changed, 7 insertions, 55 deletions

diff --git a/.travis.yml b/.travis.yml
index 959218f..c0bd813 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ python:
   - 3.3
   - 3.4
   - 3.5
-  - pypy
 install:
   - python setup.py dev
 script:
diff --git a/setup.py b/setup.py
index d036670..d0c54c6 100644
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,8 @@ tests_require = [
 if sys.version_info[0:2] < (2, 7):
     install_requires.append('ordereddict')
     tests_require.append('unittest2')
+else:
+    tests_require.append('unittest2py3k')
 
 
 setup(name='WebTest',
diff --git a/tox.ini b/tox.ini
index fbbca82..241e7a3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,19 +1,12 @@
 [tox]
-envlist=py33,py34,py35,py26,py27,coverage
+skip_missing_interpreters=true
+envlist=py26,py27,py33,py34,py35,coverage
 
 [testenv]
-commands =
-  {envbindir}/python --version
-  {envbindir}/pip freeze
-  {envbindir}/nosetests  --with-coverage --with-xunit --xunit-file=nosetests-{envname}.xml []
-  {envbindir}/coverage xml -o coverage-{envname}.xml
 setenv =
   LC_ALL=C
   LANG=C
-  SELENIUM_DRIVER=firefox
   COVERAGE_FILE=.coverage.{envname}
-
-[common]
 deps =
   nose<1.3.0
   webtest[tests]
@@ -23,54 +16,12 @@ deps =
   BeautifulSoup4
   PasteDeploy
   WSGIProxy2
-
-[PY2]
-deps =
-    unittest2
-
-[PY3]
-deps =
-    unittest2py3k
-
-[testenv:py26]
-deps =
-    {[common]deps}
-    {[PY2]deps}
-    ordereddict
-
-[testenv:py27]
-deps =
-    {[common]deps}
-    {[PY2]deps}
-
-[testenv:pypy]
-deps =
-    {[common]deps}
-    {[PY2]deps}
-
-[testenv:py32]
-deps =
-    {[common]deps}
-    {[PY3]deps}
-
-[testenv:py33]
-deps =
-    {[common]deps}
-    {[PY3]deps}
-
-[testenv:py34]
-deps =
-    {[common]deps}
-    {[PY3]deps}
-
-[testenv:py35]
-deps =
-    {[common]deps}
-    {[PY3]deps}
 commands =
   {envbindir}/python --version
   {envbindir}/pip freeze
-  {envbindir}/nosetests
+  py{26,27,33}: {envbindir}/nosetests  --with-coverage --with-xunit --xunit-file=nosetests-{envname}.xml []
+  py{26,27,33}: {envbindir}/coverage xml -o coverage-{envname}.xml
+  py{34,35}: {envbindir}/nosetests
 
 [testenv:coverage]
 deps =