Big tox/Travis CI update to make both test the same set of things.

gsnedders · gsnedders · commit e1d9a5b14ac5 · 2015-12-03T04:37:37.000Z
Oh, and this adds PyPy3, while we're at it.

In short: we now test both with and without optional packages in tox
and fix Travis CI to test with optional packages under PyPy.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,8 @@ python:
   - "3.4"
   - "3.5"
   - "pypy"
+  - "pypy3"
+
 sudo: false
 
 cache:
diff --git a/requirements-install.sh b/requirements-install.sh
@@ -7,10 +7,12 @@ fi
 
 pip install -r requirements-test.txt
 
-if [[ $USE_OPTIONAL == "true" && $TRAVIS_PYTHON_VERSION != "pypy" ]]; then
-  if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then
-    pip install --allow-external Genshi --allow-insecure Genshi -r requirements-optional-2.6.txt
+if [[ $USE_OPTIONAL == "true" ]]; then
+  if [[ $TRAVIS_PYTHON_VERSION == "pypy" || $TRAVIS_PYTHON_VERSION == "pypy3" ]]; then
+    pip install -r requirements-optional.txt
+  elif [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then
+    pip install -r requirements-optional-2.6.txt
   else
-    pip install --allow-external Genshi --allow-insecure Genshi -r requirements-optional-cpython.txt
+    pip install -r requirements-optional-cpython.txt
   fi
 fi
diff --git a/tox.ini b/tox.ini
@@ -1,33 +1,16 @@
 [tox]
-envlist = py26,py27,py32,py33,py34,py35,pypy
+envlist = {py26,py27,py32,py33,py34,py35,pypy,pypy3}-{base,optional}
 
 [testenv]
 deps =
-  -r{toxinidir}/requirements-optional-cpython.txt
   flake8
   nose
   mock
+  py26-base: ordereddict
+  py26-optional: -r{toxinidir}/requirements-optional-2.6.txt
+  {py27,py32,py33,py34,py35}-optional: -r{toxinidir}/requirements-optional-cpython.txt
+  {pypy,pypy3}-optional: -r{toxinidir}/requirements-optional.txt
+
 commands =
   {envbindir}/nosetests -q
   {toxinidir}/flake8-run.sh
-install_command =
-  pip install {opts} {packages}
-
-[testenv:pypy]
-# lxml doesn't work and datrie doesn't make sense
-# (it's slower than the pure-python version)
-deps =
-  charade
-  flake8
-  Genshi
-  nose
-  six
-  mock
-
-[testenv:py26]
-basepython = python2.6
-deps =
-  -r{toxinidir}/requirements-optional-2.6.txt
-  flake8
-  nose
-  mock

-Original file line number
+Diff line change
   - "3.4"
   - "3.5"
   - "pypy"
 +  - "pypy3"
++
 sudo: false
 cache: