[Python-modules-commits] [python-django-treebeard] 10/11: merge patched into master

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository python-django-treebeard.

commit 5d5e3647e9061ba129d010977cfb44ea4f6f8901
Merge: 9621ca5 ac2b1ca
Author: Michael Fladischer <fladi at debian.org>
Date:   Fri Jun 23 11:50:38 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...4-Re-enable-model-migrations-during-tests.patch | 40 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 treebeard/tests/settings.py                        | 20 +++++------
 4 files changed, 53 insertions(+), 12 deletions(-)

diff --cc debian/.git-dpm
index fd59731,0000000..5f2780f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 63f62d765bd9ef7f48019b94b2915823ef16441d
- 63f62d765bd9ef7f48019b94b2915823ef16441d
++ac2b1ca04126e5af7c43a60c6ca822832dec32ea
++ac2b1ca04126e5af7c43a60c6ca822832dec32ea
 +fa17de54982188d431a9b41c73231cf5392aa235
 +fa17de54982188d431a9b41c73231cf5392aa235
 +python-django-treebeard_4.1.2+dfsg.orig.tar.gz
 +c38d0f45b9cc94b94ce5d56a1af43c46cef2d351
 +290056
diff --cc debian/patches/0004-Re-enable-model-migrations-during-tests.patch
index 0000000,0000000..bafca37
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Re-enable-model-migrations-during-tests.patch
@@@ -1,0 -1,0 +1,40 @@@
++From ac2b1ca04126e5af7c43a60c6ca822832dec32ea Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <fladi at debian.org>
++Date: Fri, 23 Jun 2017 11:50:11 +0200
++Subject: Re-enable model migrations during tests.
++
++---
++ treebeard/tests/settings.py | 20 ++++++++++----------
++ 1 file changed, 10 insertions(+), 10 deletions(-)
++
++diff --git a/treebeard/tests/settings.py b/treebeard/tests/settings.py
++index 9b26215..422da86 100644
++--- a/treebeard/tests/settings.py
+++++ b/treebeard/tests/settings.py
++@@ -56,16 +56,16 @@ SECRET_KEY = '7r33b34rd'
++ # This little hacks forces Django into the old syncdb behaviour,
++ # creating models without migrations.
++ 
++-class DisableMigrations(object):
++-
++-    def __contains__(self, item):
++-        return True
++-
++-    def __getitem__(self, item):
++-        return "notmigrations"
++-
++-
++-MIGRATION_MODULES = DisableMigrations()
+++# class DisableMigrations(object):
+++#
+++#     def __contains__(self, item):
+++#         return True
+++#
+++#     def __getitem__(self, item):
+++#         return "notmigrations"
+++#
+++#
+++# MIGRATION_MODULES = DisableMigrations()
++ 
++ INSTALLED_APPS = [
++     'django.contrib.auth',
diff --cc debian/patches/series
index 5a4d355,0000000..bfa95b1
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +0001-Remove-version-infromation-from-jquery-ui-filename.patch
 +0002-Make-intersphinx-use-local-copies-of-objects.inv-fil.patch
 +0003-Remove-djangodocs-extension-from-sphinx-configuratio.patch
++0004-Re-enable-model-migrations-during-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-treebeard.git