|
14 | 14 | - DB=sqlite DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
|
15 | 15 | - DB=sqlite DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
|
16 | 16 | - DB=sqlite DJANGO_VERSION=1.6.1 PSYCOPG_VERSION=2.4.5
|
| 17 | + - DB=sqlite DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5 |
17 | 18 |
|
18 | 19 | - DB=mysql DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
|
19 | 20 | - DB=mysql DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
|
20 | 21 | - DB=mysql DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
|
21 | 22 | - DB=mysql DJANGO_VERSION=1.6.1 PSYCOPG_VERSION=2.4.5
|
| 23 | + - DB=mysql DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5 |
22 | 24 |
|
23 | 25 | - DB=postgres DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
|
24 | 26 | - DB=postgres DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
|
25 | 27 | - DB=postgres DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
|
26 | 28 | - DB=postgres DJANGO_VERSION=1.6.1 PSYCOPG_VERSION=2.4.5
|
| 29 | + - DB=postgres DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5 |
| 30 | + |
| 31 | + |
27 | 32 |
|
28 | 33 | install:
|
29 | 34 | - pip install pytest
|
30 | 35 | - pip install django-configurations>=0.2.1
|
31 |
| - - 'pip install django==$DJANGO_VERSION' |
| 36 | + - 'if [ "$DJANGO_VERSION" != "master" ]; then pip install django==$DJANGO_VERSION; fi' |
| 37 | + - 'if [ "$DJANGO_VERSION" == "master" ]; then pip install pip install -e git+https://github.com/django/django@master#egg=Django; fi' |
32 | 38 | - 'if [ "$TRAVIS_PYTHON_VERSION" == "pypy" -a "$DB" == postgres ]; then pip install psycopg2ct; fi'
|
33 | 39 | - 'if [ "$TRAVIS_PYTHON_VERSION" != "pypy" -a "$DB" == postgres ]; then pip install psycopg2==$PSYCOPG_VERSION; fi'
|
34 | 40 | - 'if [ "$DB" == mysql ]; then pip install mysql-python; fi'
|
@@ -100,3 +106,13 @@ matrix:
|
100 | 106 | env: DB=mysql DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
|
101 | 107 | - python: "3.3"
|
102 | 108 | env: DB=mysql DJANGO_VERSION=1.6.1 PSYCOPG_VERSION=2.4.5
|
| 109 | + |
| 110 | + # Django 1.7 and Python 2.6 |
| 111 | + - python: "2.6" |
| 112 | + env: DB=sqlite DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5 |
| 113 | + |
| 114 | + - python: "2.6" |
| 115 | + env: DB=mysql DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5 |
| 116 | + |
| 117 | + - python: "2.6" |
| 118 | + env: DB=postgres DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5 |
0 commit comments