language: python
python:
  - "2.7"
  - "3.2"
  - "3.3"
services:
  - redis-server
before_script:
  - psql -c 'create database django_simpleimages;' -U postgres
install:
  - pip install -e . -r requirements-testing.txt $DJANGO_VERSION
script:
  - py.test
after_success:
  - coveralls
env:
  matrix:
    - DJANGO_VERSION="django>=1.5,<1.6"
    - DJANGO_VERSION="django>=1.6,<1.7"
    - DJANGO_VERSION="https://www.djangoproject.com/m/releases/1.7/Django-1.7b1.tar.gz"

language: python
python:
  - "2.7"
  - "3.2"
  - "3.3"
services:
  - redis-server
before_script:
  - psql -c 'create database django_simpleimages;' -U postgres
install:
  - pip install -e . -r requirements-testing.txt $DJANGO_VERSION
script:
  - py.test
after_success:
  - coveralls
env:
  matrix:
    - DJANGO_VERSION="django>=1.5,<1.6"
    - DJANGO_VERSION="django>=1.6,<1.7"
    - DJANGO_VERSION="https://www.djangoproject.com/m/releases/1.7/Django-1.7b1.tar.gz"
matrix:
  allow_failures:
    - env: DJANGO_VERSION="https://www.djangoproject.com/m/releases/1.7/Django-1.7b1.tar.gz"

Revert "dont allow django 1.7 to fail"
Revert "dont allow django 1.7 to fail"

This reverts commit 7eed06e634d7af85ba8e1dededd9ba0d4ecb87f7.

Conflicts:
	.travis.yml
