Skip to content

Commit e44d099

Browse files
committed
Run tests on Django 1.9
1 parent 37b4033 commit e44d099

File tree

3 files changed

+699
-298
lines changed

3 files changed

+699
-298
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ env:
1313
- TESTENV=python2.7-2.8.0-1.6-sqlite_file
1414
- TESTENV=python2.7-2.8.0-1.7-sqlite_file
1515
- TESTENV=python2.7-2.8.0-1.8-sqlite_file
16+
- TESTENV=python2.7-2.8.0-1.9-sqlite_file
1617
- TESTENV=python2.7-2.8.0-master-mysql_innodb
1718
- TESTENV=python2.7-2.8.0-master-mysql_myisam
1819
- TESTENV=python2.7-2.8.0-master-sqlite_file
@@ -22,6 +23,7 @@ env:
2223
- TESTENV=python3.4-2.8.0-1.6-sqlite_file
2324
- TESTENV=python3.4-2.8.0-1.7-sqlite_file
2425
- TESTENV=python3.4-2.8.0-1.8-sqlite_file
26+
- TESTENV=python3.4-2.8.0-1.9-sqlite_file
2527
- TESTENV=python3.4-2.8.0-master-sqlite_file
2628
- TESTENV=python3.5-2.7.3-master-sqlite_file
2729
- TESTENV=python3.5-2.8.0-master-postgres

generate_configurations.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def is_pypy(self):
2828
PYTHON_VERSIONS = ['python2.6', 'python2.7', 'python3.2', 'python3.3',
2929
'python3.4', 'python3.5', 'pypy', 'pypy3']
3030
PYTEST_VERSIONS = ['2.7.3', '2.8.0']
31-
DJANGO_VERSIONS = ['1.3', '1.4', '1.5', '1.6', '1.7', '1.8', 'master']
31+
DJANGO_VERSIONS = ['1.3', '1.4', '1.5', '1.6', '1.7', '1.8', '1.9', 'master']
3232
SETTINGS = ['sqlite', 'sqlite_file', 'mysql_myisam', 'mysql_innodb',
3333
'postgres']
3434
DJANGO_REQUIREMENTS = {
@@ -38,6 +38,7 @@ def is_pypy(self):
3838
'1.6': 'Django>=1.6,<1.7',
3939
'1.7': 'Django>=1.7,<1.8',
4040
'1.8': 'Django>=1.8,<1.9',
41+
'1.9': 'Django==1.9a1',
4142
'master': 'https://github.com/django/django/archive/master.tar.gz',
4243
}
4344

0 commit comments

Comments
 (0)