---
language: python
python:
- '2.7'
- '2.6'
- '3.3'
services:
- elasticsearch
before_install:
- export PIP_USE_MIRRORS=true
- phantomjs --version
- phantomjs --webdriver= &
install:
- pip install -r requirements-test.txt
- pip install -e .
script:
- make test
branches:
  only:
  - master
  - python3

---
language: python
python:
- '2.7'
- '2.6'
- '3.3'
services:
- elasticsearch
before_install:
- export PIP_USE_MIRRORS=true
- phantomjs --version
- phantomjs --webdriver= &
install:
- pip install -r requirements-test.txt
- pip install -e .
script:
- make test
branches:
  only:
  - master
  - django1.6
  - heroku

Add Django 1.6 and Heroku branch to Travis testing
Add Django 1.6 and Heroku branch to Travis testing