Merge pull request #321 from algolia/fix/travis

Fix/travis

Author: LeoErcolanelli

.travis.yml

@@ -1,25 +1,25 @@
 branches:
   only:
     - master
-language: python
+
 sudo: false
+
 before_script:
-- wget https://storage.googleapis.com/appengine-sdks/featured/google_appengine_1.9.27.zip
-- unzip -q google_appengine_1.9.27.zip
+  - wget https://storage.googleapis.com/appengine-sdks/featured/google_appengine_1.9.27.zip
+  - unzip -q google_appengine_1.9.27.zip
+
 install:
-- pip install --upgrade pip
-- if [[ $TOXENV == 'py32' ]]; then pip install -I 'virtualenv<14.0'; fi
-- pip install tox
+  - pip install --upgrade pip
+  - if [[ $TOXENV == 'py32' ]]; then pip install -I 'virtualenv<14.0'; fi
+  - pip install tox-travis
+
 script:
-- tox
-python: 3.5
-env:
-  matrix:
-  - TOXENV=py27
-  - TOXENV=py33
-  - TOXENV=py34
-  - TOXENV=py35
-  - TOXENV=py36
-  - TOXENV=coveralls-py2
-  - TOXENV=coveralls-py3
-  - TOXENV=py27 APPENGINE_RUNTIME=python27
+  - tox
+
+language: python
+
+python:
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"

tox.ini

@@ -1,39 +1,35 @@
 [tox]
 envlist =
     py27
-    py33
     py34
     py35
     py36
-    coverage
+    appengine
+    coveralls-py2
+    coveralls-py3
+
 skip_missing_interpreters = True
 
+# Defaults settings.
 [testenv]
-setenv =
-    PYTHONPATH = {toxinidir}/google_appengine
 deps =
-    py26: importlib
     faker
     pytest
-
 passenv =
     ALGOLIA*
     APPENGINE*
     TRAVIS*
+
 commands = pytest tests
 
-[testenv:coverage]
+# Appengine settings.
+[testenv:appengine]
 basepython = python2.7
-deps =
-    faker
-    pytest
-    coverage
-passenv =
-    ALGOLIA*
-commands =
-    coverage run --branch --source=algoliasearch -m pytest
-    coverage report
+setenv =
+    APPENGINE_RUNTIME = python27
+    PYTHONPATH = {toxinidir}/google_appengine
 
+# Python 2 coverage.
 [testenv:coveralls-py2]
 basepython = python2.7
 deps =
@@ -49,6 +45,7 @@ commands =
     coverage report
     coveralls
 
+# Python 3 coverage.
 [testenv:coveralls-py3]
 basepython = python3.4
 deps =
@@ -63,3 +60,10 @@ commands =
     coverage run --branch --source=algoliasearch -m pytest tests
     coverage report
     coveralls
+
+[travis]
+python =
+    2.7: py27, coveralls-py2, appengine
+    3.4: py34, coveralls-py3
+    3.5: py35
+    3.6: py36