summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Williams <codehelp@debian.org>2014-09-15 14:27:23 -0700
committerNeil Williams <codehelp@debian.org>2014-09-15 14:27:23 -0700
commit3d9637a293f713838362f0e7865fa7bd6f858a4c (patch)
treefcae52380f8c0a0d89bb5dd4d0e24e9f528ff4ad
parent2394c263c01d4f8844e152d436b7f8107ce24fa7 (diff)
Allow for django1.7 to use the setup routine0.7.4
Debian Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755661
-rw-r--r--django_testscenarios/tests.py5
-rwxr-xr-xsetup.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/django_testscenarios/tests.py b/django_testscenarios/tests.py
index b20f494..5fad151 100644
--- a/django_testscenarios/tests.py
+++ b/django_testscenarios/tests.py
@@ -17,6 +17,7 @@
# along with django-testscenarios. If not, see <http://www.gnu.org/licenses/>.
import unittest
+import django
from django.db import models, transaction
from django.test import (
@@ -30,6 +31,10 @@ from django_testscenarios.ubertest import (
TransactionTestCaseWithScenarios)
+if hasattr(django, 'setup'):
+ django.setup()
+
+
class TestModel(models.Model):
"""
Model for testing database configuration/initialization
diff --git a/setup.py b/setup.py
index 8b9b6fd..e2ea563 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ from setuptools import setup
setup(
name='django-testscenarios',
- version="0.7.3",
+ version="0.7.4",
author="Linaro Limited",
author_email="lava-team@linaro.org",
description="Test scenarios for Django",