summaryrefslogtreecommitdiff
path: root/debian/patches/add-django-1.7-compat-with-new-django.setup.patch
diff options
context:
space:
mode:
authorThomas Goirand <thomas@goirand.fr>2014-10-12 04:37:56 +0000
committerThomas Goirand <thomas@goirand.fr>2014-10-12 04:37:56 +0000
commitd34d35ee07712306d86fff68db5fe28dbe263ed6 (patch)
tree0c0225b8aa5442f9a8fbf53a0c7941acc8cf26ec /debian/patches/add-django-1.7-compat-with-new-django.setup.patch
parent6af6ed34537fa102ef5940b3cb095b5f23f13a9a (diff)
downloadfactory-boy-d34d35ee07712306d86fff68db5fe28dbe263ed6.tar
factory-boy-d34d35ee07712306d86fff68db5fe28dbe263ed6.tar.gz
* Add a patch to call django.setup() if using Django 1.7 in the unit tests.
This fixes FTBFS (Closes: #764837).
Diffstat (limited to 'debian/patches/add-django-1.7-compat-with-new-django.setup.patch')
-rw-r--r--debian/patches/add-django-1.7-compat-with-new-django.setup.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/debian/patches/add-django-1.7-compat-with-new-django.setup.patch b/debian/patches/add-django-1.7-compat-with-new-django.setup.patch
new file mode 100644
index 0000000..f2cf540
--- /dev/null
+++ b/debian/patches/add-django-1.7-compat-with-new-django.setup.patch
@@ -0,0 +1,18 @@
+Description: Make unit tests work with Django 1.7
+Author: Thomas Goirand <zigo@debian.org>
+Bug-Debian: https://bugs.debian.org/764837
+Forwarded: no
+Last-Update: 2014-10-12
+
+--- factory-boy-2.4.1.orig/tests/test_django.py
++++ factory-boy-2.4.1/tests/test_django.py
+@@ -50,6 +50,9 @@ from . import tools
+ if django is not None:
+ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tests.djapp.settings')
+
++ if hasattr(django, 'setup'):
++ django.setup()
++
+ from django import test as django_test
+ from django.conf import settings
+ from django.db import models as django_models