Revert "Use Travis to handle the Matrix"

This reverts commit 01894aee7b.

.travis.yml

@@ -1,39 +1,25 @@
 language: python
 
-python:
-  - "2.6"
-  - "2.7"
-  - "3.2"
-  - "3.3"
-  - "pypy"
-
-matrix:
-  include:
-    - python: "2.7"
-      env: TOXENV=docs
-
-    - python: "2.7"
-      env: TOXENV=pep8
-
-    - python: "2.7"
-      env: TOXENV=py3pep8
-
-    # Move to the python declaration above once Travis supports Python 3.4
-    - python: "2.7"
-      env: TOXENV=py34
+env:
+  - TOXENV=pep8
+  - TOXENV=py3pep8
+  - TOXENV=docs
+  - TOXENV=py26
+  - TOXENV=py27
+  - TOXENV=py32
+  - TOXENV=py33
+  - TOXENV=py34
+  - TOXENV=pypy
 
 before_install:
   - "[ -d ~/.distlib ] && sudo chown -R travis:travis ~/.distlib || true"
 
 install:
-  - "if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then sudo add-apt-repository -y ppa:pypy/ppa; fi"
-  - "if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then sudo apt-get -y update && sudo apt-get -y install pypy; fi"
+  - "if [[ $TOXENV == 'pypy' ]]; then sudo add-apt-repository -y ppa:pypy/ppa; fi"
+  - "if [[ $TOXENV == 'pypy' ]]; then sudo apt-get -y update && sudo apt-get -y install pypy; fi"
   # This is required because we need to get rid of the Travis installed PyPy
   # or it'll take precedence over the PPA installed one.
-  - "if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then sudo rm -rf /usr/local/pypy/bin; fi"
-  # This is required because otherwise we get a really slow PyPy
-  - "if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then deactivate; fi"
-  - "if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then sudo pip install --upgrade setuptools tox; fi"
+  - "if [[ $TOXENV == 'pypy' ]]; then sudo rm -rf /usr/local/pypy/bin; fi"
   - "if [[ $TOXENV == 'py34' ]]; then .travis/py34.sh; fi"
   - sudo apt-get install subversion bzr mercurial
   - echo -e "[web]\ncacerts = /etc/ssl/certs/ca-certificates.crt" >> ~/.hgrc
@@ -42,7 +28,7 @@ install:
   - pip install --upgrade setuptools
   - pip install tox
 
-script: .travis/run.py
+script: tox
 
 branches:
   only:

.travis/run.py

@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-import os
-import tox
-
-if not os.environ.get("TOXENV"):
-    if os.environ["TRAVIS_PYTHON_VERSION"] == "pypy":
-        os.environ["TOXENV"] = "pypy"
-    else:
-        os.environ["TOXENV"] = "py{0}".format(
-            "".join(os.environ["TRAVIS_PYTHON_VERSION"].split(".")[:2]),
-        )
-
-tox.cmdline()