Skip to content

Commit

Permalink
Update travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
Gaël UTARD committed Aug 16, 2016
1 parent e94c514 commit 55ad7ad
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 44 deletions.
56 changes: 13 additions & 43 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,27 @@
sudo: required
language: python

python:
- 2.7
- 3.3
- 3.4
- 3.5

env:
matrix:
- DJANGO_VERSION=1.4.22 DATABASE=sqlite
- DJANGO_VERSION=1.6.11 DATABASE=postgres
- DJANGO_VERSION=1.6.11 DATABASE=sqlite
- DJANGO_VERSION=1.7.11 DATABASE=postgres
- DJANGO_VERSION=1.7.11 DATABASE=sqlite
- DJANGO_VERSION=1.8.7 DATABASE=postgres
- DJANGO_VERSION=1.8.7 DATABASE=sqlite
- DJANGO_VERSION=1.9 DATABASE=postgres
- DJANGO_VERSION=1.9 DATABASE=sqlite
- DJANGO_VERSION=1.8.14 DATABASE=postgres
- DJANGO_VERSION=1.8.14 DATABASE=sqlite
- DJANGO_VERSION=1.9.9 DATABASE=postgres
- DJANGO_VERSION=1.9.9 DATABASE=sqlite
- DJANGO_VERSION=1.10 DATABASE=postgres
- DJANGO_VERSION=1.10 DATABASE=sqlite
- DJANGO_VERSION=dev DATABASE=postgres
- DJANGO_VERSION=dev DATABASE=sqlite

matrix:
exclude:
- python: 3.3
env: DJANGO_VERSION=1.4.22 DATABASE=sqlite
- python: 3.3
env: DJANGO_VERSION=1.4.22 DATABASE=postgres
- python: 3.4
env: DJANGO_VERSION=1.4.22 DATABASE=sqlite
- python: 3.4
env: DJANGO_VERSION=1.4.22 DATABASE=postgres
- python: 3.5
env: DJANGO_VERSION=1.4.22 DATABASE=sqlite
- python: 3.5
env: DJANGO_VERSION=1.4.22 DATABASE=postgres
- python: 3.3
env: DJANGO_VERSION=1.6.11 DATABASE=sqlite
- python: 3.4
env: DJANGO_VERSION=1.6.11 DATABASE=sqlite
- python: 3.4
env: DJANGO_VERSION=1.6.11 DATABASE=postgres
- python: 3.5
env: DJANGO_VERSION=1.6.11 DATABASE=sqlite
- python: 3.5
Expand All @@ -48,28 +30,16 @@ matrix:
env: DJANGO_VERSION=1.7.11 DATABASE=sqlite
- python: 3.5
env: DJANGO_VERSION=1.7.11 DATABASE=postgres
- python: 3.3
env: DJANGO_VERSION=1.9 DATABASE=sqlite
- python: 3.3
env: DJANGO_VERSION=1.9 DATABASE=postgres
- python: 3.3
env: DJANGO_VERSION=dev DATABASE=sqlite
- python: 3.3
env: DJANGO_VERSION=dev DATABASE=postgres

allow_failures:
- python: 3.5
env: DJANGO_VERSION=dev DATABASE=sqlite
- python: 3.5
env: DJANGO_VERSION=dev DATABASE=postgres
- python: 3.4
env: DJANGO_VERSION=dev DATABASE=sqlite
- python: 3.4
env: DJANGO_VERSION=dev DATABASE=postgres
- python: 2.7
env: DJANGO_VERSION=dev DATABASE=sqlite
- python: 2.7
env: DJANGO_VERSION=dev DATABASE=postgres
- python: 3.5
env: DJANGO_VERSION=dev DATABASE=sqlite
- python: 3.5
env: DJANGO_VERSION=dev DATABASE=postgres

before_install:
- sudo apt-get update
Expand All @@ -84,10 +54,10 @@ install:
- if [[ $DATABASE == postgres ]]; then pip install psycopg2; fi

# This is a dependency of our Django test script
- pip install argparse --use-mirrors
- pip install argparse
- if [[ $DJANGO_VERSION == dev ]]; then pip
install https://github.com/django/django/tarball/master/django.tar.gz#egg=django; else pip
install -q Django==$DJANGO_VERSION --use-mirrors; fi
install -q Django==$DJANGO_VERSION; fi

- pip install coverage
- pip install flake8
Expand Down
2 changes: 1 addition & 1 deletion quicktest.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class QuickDjangoTest(object):
]

if django.VERSION >= (1, 8, 0):
TEMPLATES = [
self.TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'APP_DIRS': True,
Expand Down

0 comments on commit 55ad7ad

Please sign in to comment.