diff --git a/.travis.yml b/.travis.yml index b078045..1495f54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ env: - DJANGO=django==1.4 - DJANGO=django==1.5 - 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: exclude: # Django < 1.5 not supported on python 3 @@ -21,6 +21,8 @@ matrix: env: DJANGO=django==1.5 - python: "2.6" env: DJANGO=django==1.6 + - python: "2.6" + env: DJANGO=django==https://www.djangoproject.com/download/1.7b1/tarball/ install: - pip install -q $DJANGO --use-mirrors - pip install . --use-mirrors diff --git a/README.rst b/README.rst index e218953..d6388be 100644 --- a/README.rst +++ b/README.rst @@ -30,7 +30,7 @@ package. It includes: via Django signals * 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+). .. END shared-intro diff --git a/runtests.py b/runtests.py index f38a567..aa7cf63 100644 --- a/runtests.py +++ b/runtests.py @@ -24,6 +24,12 @@ settings.configure( ) ) +try: + # Django 1.7+ initialize app registry + from django import setup + setup() +except ImportError: + pass try: from django.test.runner import DiscoverRunner as TestRunner # Django 1.6+