Use Travis’ matrix support rather than tox

This avoids a layer of build setup and makes the Travis
console reports more useful

Author: acdha

.travis.yml

@@ -1,64 +1,57 @@
 sudo: false
 language: python
 python:
-  - "2.7"
+    - "2.6"
+    - "2.7"
+    - "3.3"
+    - "3.4"
+    - "pypy"
 
 cache:
-  apt: true
-  pip: true
-  directories:
-    - $HOME/download-cache
+    apt: true
+    pip: true
+    directories:
+        - $HOME/download-cache
 
 addons:
-  apt_packages:
-    - binutils
-    - default-jdk
-    - gdal-bin
-    - libgdal1h
-    - libgeos-c1
-    - libproj-dev
-    - libxapian22
-    - python-xapian
-    - wajig
+    apt_packages:
+        - binutils
+        - default-jdk
+        - gdal-bin
+        - libgdal1h
+        - libgeos-c1
+        - libproj-dev
+        - libxapian22
+        - python-xapian
+        - wajig
 
 before_install:
-  - mkdir -p $HOME/download-cache
+    - mkdir -p $HOME/download-cache
 
 install:
-  - pip install tox requests
-  - pip install -e .
+    - pip install requests "Django${DJANGO_VERSION}"
+    - python setup.py clean build install
 
 before_script:
-  - BACKGROUND_SOLR=true test_haystack/solr_tests/server/start-solr-test-server.sh
-  - tox --notest -e $TOX_ENV
+    - BACKGROUND_SOLR=true test_haystack/solr_tests/server/start-solr-test-server.sh
 
 script:
-  - tox -e $TOX_ENV
+    - python test_haystack/solr_tests/server/wait-for-solr
+    - python setup.py test
 
 env:
-  matrix:
-    - TOX_ENV=py26-django1.6
-    - TOX_ENV=py27-django1.6
-    - TOX_ENV=py27-django1.7
-    - TOX_ENV=py27-django1.8
-    - TOX_ENV=py33-django1.6
-    - TOX_ENV=py33-django1.7
-    - TOX_ENV=py34-django1.6
-    - TOX_ENV=py34-django1.7
-    - TOX_ENV=py34-django1.8
-    - TOX_ENV=pypy-django1.6
-    - TOX_ENV=pypy-django1.7
-    - TOX_ENV=pypy-django1.8
+    matrix:
+        - DJANGO_VERSION=">=1.6,<1.7"
+        - DJANGO_VERSION=">=1.7,<1.8"
+        - DJANGO_VERSION=">=1.8,<1.9"
 
 matrix:
-  allow_failures:
-    - env: TOX_ENV=pypy-django1.6
-    - env: TOX_ENV=pypy-django1.7
-    - env: TOX_ENV=pypy-django1.8
+    allow_failures:
+        - python: "pypy"
 
 services:
-  - elasticsearch
+    - elasticsearch
 
 notifications:
-  irc: "irc.freenode.org#haystack"
-  email: false
+    irc: "irc.freenode.org#haystack"
+    email: false