[Python-modules-commits] [python-django-treebeard] 06/13: Refresh patches, drop Re-enable-model-migrations-during-tests as it was applied upstream.

[Michael Fladischer]

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

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

commit 3d5afd1da055ba1eced5fceb658495e7692767bf
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sun Jan 21 15:02:00 2018 +0100

    Refresh patches, drop Re-enable-model-migrations-during-tests as it was applied upstream.
---
 debian/changelog                                   |  2 ++
 ...rsion-infromation-from-jquery-ui-filename.patch |  2 +-
 ...4-Re-enable-model-migrations-during-tests.patch | 39 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa95e54..3c18292 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ python-django-treebeard (4.2.0+dfsg-1) UNRELEASED; urgency=low
   * Refresh patches after git-dpm to gbp pq conversion
   * Always use pristine-tar.
   * New upstream release.
+  * Refresh patches, drop Re-enable-model-migrations-during-tests as it
+    was applied upstream.
 
  -- Michael Fladischer <fladi at debian.org>  Sat, 13 Jan 2018 18:59:35 +0100
 
diff --git a/debian/patches/0001-Remove-version-infromation-from-jquery-ui-filename.patch b/debian/patches/0001-Remove-version-infromation-from-jquery-ui-filename.patch
index a9d5413..ce1d171 100644
--- a/debian/patches/0001-Remove-version-infromation-from-jquery-ui-filename.patch
+++ b/debian/patches/0001-Remove-version-infromation-from-jquery-ui-filename.patch
@@ -28,7 +28,7 @@ index 9794ac6..90cf6e2 100644
      # Jquery UI is needed to call disableSelection() on drag and drop so
      # text selections arent marked while dragging a table row
 diff --git a/treebeard/tests/test_treebeard.py b/treebeard/tests/test_treebeard.py
-index 0817848..fbd6276 100644
+index d0e7a6b..415f33e 100644
 --- a/treebeard/tests/test_treebeard.py
 +++ b/treebeard/tests/test_treebeard.py
 @@ -2341,7 +2341,7 @@ class TestAdminTreeTemplateTags(TestCase):
diff --git a/debian/patches/0004-Re-enable-model-migrations-during-tests.patch b/debian/patches/0004-Re-enable-model-migrations-during-tests.patch
deleted file mode 100644
index 72ac027..0000000
--- a/debian/patches/0004-Re-enable-model-migrations-during-tests.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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 --git a/debian/patches/series b/debian/patches/series
index bfa95b1..5a4d355 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 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