Skip to content

Commit 7312730

Browse files
committed
travis: Django master
1 parent c3ccf28 commit 7312730

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

.travis.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,27 @@ env:
1414
- DB=sqlite DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
1515
- DB=sqlite DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
1616
- DB=sqlite DJANGO_VERSION=1.6.1 PSYCOPG_VERSION=2.4.5
17+
- DB=sqlite DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5
1718

1819
- DB=mysql DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
1920
- DB=mysql DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
2021
- DB=mysql DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
2122
- DB=mysql DJANGO_VERSION=1.6.1 PSYCOPG_VERSION=2.4.5
23+
- DB=mysql DJANGO_VERSION=master PSYCOPG_VERSION=2.4.5
2224

2325
- DB=postgres DJANGO_VERSION=1.3.5 PSYCOPG_VERSION=2.4.1
2426
- DB=postgres DJANGO_VERSION=1.4.3 PSYCOPG_VERSION=2.4.5
2527
- DB=postgres DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
2628
- 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+
2732

2833
install:
2934
- pip install pytest
3035
- 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'
3238
- 'if [ "$TRAVIS_PYTHON_VERSION" == "pypy" -a "$DB" == postgres ]; then pip install psycopg2ct; fi'
3339
- 'if [ "$TRAVIS_PYTHON_VERSION" != "pypy" -a "$DB" == postgres ]; then pip install psycopg2==$PSYCOPG_VERSION; fi'
3440
- 'if [ "$DB" == mysql ]; then pip install mysql-python; fi'
@@ -100,3 +106,13 @@ matrix:
100106
env: DB=mysql DJANGO_VERSION=1.5.2 PSYCOPG_VERSION=2.4.5
101107
- python: "3.3"
102108
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

Comments
 (0)