Start testing Django 1.7b1

This commit is contained in:
medmunds
2014-04-20 14:45:29 -07:00
parent 28c5a3a742
commit 1e39e4d5c8
3 changed files with 10 additions and 2 deletions

View File

@@ -8,7 +8,7 @@ env:
- DJANGO=django==1.4 - DJANGO=django==1.4
- DJANGO=django==1.5 - DJANGO=django==1.5
- DJANGO=django==1.6 - DJANGO=django==1.6
#- DJANGO=https://github.com/django/django/tarball/stable/1.6.x - DJANGO=https://www.djangoproject.com/download/1.7b1/tarball/
matrix: matrix:
exclude: exclude:
# Django < 1.5 not supported on python 3 # Django < 1.5 not supported on python 3
@@ -21,6 +21,8 @@ matrix:
env: DJANGO=django==1.5 env: DJANGO=django==1.5
- python: "2.6" - python: "2.6"
env: DJANGO=django==1.6 env: DJANGO=django==1.6
- python: "2.6"
env: DJANGO=django==https://www.djangoproject.com/download/1.7b1/tarball/
install: install:
- pip install -q $DJANGO --use-mirrors - pip install -q $DJANGO --use-mirrors
- pip install . --use-mirrors - pip install . --use-mirrors

View File

@@ -30,7 +30,7 @@ package. It includes:
via Django signals via Django signals
* An optional Django admin interface * An optional Django admin interface
Djrill is released under the BSD license. It is tested against Django 1.3---1.6 Djrill is released under the BSD license. It is tested against Django 1.3---1.7b1
(including Python 3 support with Django 1.5+). (including Python 3 support with Django 1.5+).
.. END shared-intro .. END shared-intro

View File

@@ -24,6 +24,12 @@ settings.configure(
) )
) )
try:
# Django 1.7+ initialize app registry
from django import setup
setup()
except ImportError:
pass
try: try:
from django.test.runner import DiscoverRunner as TestRunner # Django 1.6+ from django.test.runner import DiscoverRunner as TestRunner # Django 1.6+