From 77888735917a122f2d0be159a8bfa19326bff992 Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjaoming@gmail.com>
Date: Mon, 25 Jan 2016 21:36:51 +0100
Subject: [PATCH] reconfigure travis script matrix

---
 .travis.yml | 17 +++++++++++------
 tox.ini     | 10 +++++-----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f178f17c031..c7c38e911a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,11 +8,20 @@ python:
   - "3.4"
   - "3.5"
   - "2.7"
-  - "docs"
-  - "bdd"
 # pypy testing currently breaks because of the tempfile dir used for KALITE_HOME
 #  - "pypy"
 
+matrix:
+  include:
+    - python: "2.7"
+      env: TOX_ENV=py2.7
+      env: TOX_ENV=docs
+      env: TOX_ENV=bdd
+    - python: "3.4"
+      env: TOX_ENV=py3.4
+    - python: "3.5"
+      env: TOX_ENV=py3.5
+
 before_install:
   - pip install codecov
   - pip install tox
@@ -20,10 +29,6 @@ before_install:
 before_script:
   - tox -e lint
 
-# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
-install: 
-  - TOX_ENV=py${TRAVIS_PYTHON_VERSION}
-
 # command to run tests, e.g. python setup.py test
 script:
   - tox -e $TOX_ENV
diff --git a/tox.ini b/tox.ini
index 0269a3c53dd..aae09af2ae5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,10 +6,10 @@ basepython =
     py2.7: python2.7
     py3.4: python3.4
     py3.5: python3.5
-    pypypy: pypy
-    pydocs: python2.7
+    pypy: pypy
+    docs: python2.7
     lint: python
-    pybdd: python2.7
+    bdd: python2.7
 deps =
     -r{toxinidir}/requirements/test.txt
 commands =
@@ -21,7 +21,7 @@ deps =
 commands =
     flake8 kolibri
     
-[testenv:pydocs]
+[testenv:docs]
 changedir=docs/
 deps =
     -r{toxinidir}/requirements/docs.txt
@@ -29,7 +29,7 @@ commands =
     sphinx-build -b linkcheck ./ _build/
     # sphinx-build -b html ./ _build/
 
-[testenv:pybdd]
+[testenv:bdd]
 deps =
     -r{toxinidir}/requirements/bdd.txt
 commands =