Skip to content

Commit

Permalink
Adding Django 1.6 to the build matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
etianen committed May 5, 2015
1 parent 39f426d commit 6f33653
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
15 changes: 14 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
language: python
python:
- 2.6
- 2.7
- 3.2
- 3.3
- 3.4
env:
- DJANGO=django==1.6.11
- DJANGO=django==1.7.7
- DJANGO=django==1.8
- DJANGO=django==1.8.1
exclude:
- python: 2.6
env: DJANGO=django==1.7.7
- python: 2.6
env: DJANGO=django==1.8.1
- python: 3.2
env: DJANGO=django==1.6.11
- python: 3.3
env: DJANGO=django==1.6.11
- python: 3.4
env: DJANGO=django==1.6.11
matrix:
fast_finish: true
install:
Expand Down
5 changes: 4 additions & 1 deletion src/reversion/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
from __future__ import unicode_literals

from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes.fields import GenericForeignKey
try:
from django.contrib.contenttypes.fields import GenericForeignKey
except ImportError: # Django < 1.9
from django.contrib.contenttypes.generic import GenericForeignKey
from django.conf import settings
from django.core import serializers
from django.core.exceptions import ObjectDoesNotExist
Expand Down

0 comments on commit 6f33653

Please sign in to comment.