From 536afb3c6bc0881d1ae2f5ac7f6b9557b4af1184 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 18 Jul 2016 08:02:08 +0000 Subject: [PATCH] Removed all patches. --- debian/changelog | 1 + ...o.setup-for-Django-1.7-compatibility.patch | 35 ------ ...r-Django-1.7-s-addition-of-an-id-att.patch | 118 ------------------ .../0003-replace-syncdb-by-migrate.patch | 17 --- debian/patches/series | 3 - 5 files changed, 1 insertion(+), 173 deletions(-) delete mode 100644 debian/patches/0001-Add-django.setup-for-Django-1.7-compatibility.patch delete mode 100644 debian/patches/0002-Fix-test-case-for-Django-1.7-s-addition-of-an-id-att.patch delete mode 100644 debian/patches/0003-replace-syncdb-by-migrate.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 853b299..3bfe015 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ python-django-bootstrap-form (3.2.1-1) unstable; urgency=medium [ Thomas Goirand ] * New upstream release. + * Removed all patches. -- Thomas Goirand Mon, 18 Jul 2016 07:59:44 +0000 diff --git a/debian/patches/0001-Add-django.setup-for-Django-1.7-compatibility.patch b/debian/patches/0001-Add-django.setup-for-Django-1.7-compatibility.patch deleted file mode 100644 index 85507da..0000000 --- a/debian/patches/0001-Add-django.setup-for-Django-1.7-compatibility.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a910e8a2c0a8d99008c811eb65096fbaaa7bf9f6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= -Date: Fri, 5 Sep 2014 10:05:22 +0200 -Subject: [PATCH 1/2] Add django.setup() for Django 1.7 compatibility - ---- - tests/__init__.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/tests/__init__.py b/tests/__init__.py -index aadc141..4533d82 100644 ---- a/tests/__init__.py -+++ b/tests/__init__.py -@@ -13,13 +13,16 @@ from django.template import Template, Context - from django.core.management import call_command - from django import forms - -+import django -+if hasattr(django, 'setup'): -+ django.setup() - - TEST_DIR = os.path.abspath(os.path.join(__file__, '..')) - - - CHOICES = ( -- (0, 'Zero'), -- (1, 'One'), -+ (0, 'Zero'), -+ (1, 'One'), - (2, 'Two'), - ) - --- -2.1.0 - diff --git a/debian/patches/0002-Fix-test-case-for-Django-1.7-s-addition-of-an-id-att.patch b/debian/patches/0002-Fix-test-case-for-Django-1.7-s-addition-of-an-id-att.patch deleted file mode 100644 index eab417a..0000000 --- a/debian/patches/0002-Fix-test-case-for-Django-1.7-s-addition-of-an-id-att.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 6a04f63c3eadc164f75c6719b362949014f889da Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= -Date: Fri, 5 Sep 2014 11:20:08 +0200 -Subject: [PATCH 2/2] Fix test case for Django 1.7's addition of an id - attribute to radio widgets - -As documented on -https://docs.djangoproject.com/en/1.7/ref/forms/widgets/#radioselect -Django 1.7 now adds id attribute to the radio fields. The test case -must be adapted to cope with this. ---- - tests/__init__.py | 12 ++++++++++++ - tests/fixtures/basic.html | 6 +++--- - tests/fixtures/horizontal.html | 6 +++--- - 3 files changed, 18 insertions(+), 6 deletions(-) - -diff --git a/tests/__init__.py b/tests/__init__.py -index 4533d82..979c2a4 100644 ---- a/tests/__init__.py -+++ b/tests/__init__.py -@@ -1,5 +1,6 @@ - import os - import sys -+import re - - os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.test_settings' - -@@ -41,6 +42,13 @@ class ExampleForm(forms.Form): - class BootstrapTemplateTagTests(TestCase): - def setUp(self): - call_command('syncdb', interactive=False) -+ self.maxDiff = None -+ -+ @classmethod -+ def drop_radio_id_with_old_django(cls, content): -+ if django.VERSION < (1, 7): -+ return re.sub(r' id="id_radio_choice_\d"', '', content) -+ return content - - def test_basic_form(self): - form = ExampleForm() -@@ -51,6 +59,8 @@ class BootstrapTemplateTagTests(TestCase): - with open(os.path.join(TEST_DIR, tpl)) as f: - content = f.read() - -+ content = self.drop_radio_id_with_old_django(content) -+ - self.assertHTMLEqual(html, content) - - def test_horizontal_form(self): -@@ -62,4 +72,6 @@ class BootstrapTemplateTagTests(TestCase): - with open(os.path.join(TEST_DIR, tpl)) as f: - content = f.read() - -+ content = self.drop_radio_id_with_old_django(content) -+ - self.assertHTMLEqual(html, content) -diff --git a/tests/fixtures/basic.html b/tests/fixtures/basic.html -index 322806e..636dfe7 100644 ---- a/tests/fixtures/basic.html -+++ b/tests/fixtures/basic.html -@@ -56,21 +56,21 @@ - -
- -
- -
- -
- -
- -
-diff --git a/tests/fixtures/horizontal.html b/tests/fixtures/horizontal.html -index b255d51..e49ee15 100644 ---- a/tests/fixtures/horizontal.html -+++ b/tests/fixtures/horizontal.html -@@ -56,21 +56,21 @@ - -
- -
- -
- -
- -
- -
--- -2.1.0 - diff --git a/debian/patches/0003-replace-syncdb-by-migrate.patch b/debian/patches/0003-replace-syncdb-by-migrate.patch deleted file mode 100644 index e55ce75..0000000 --- a/debian/patches/0003-replace-syncdb-by-migrate.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Replace syncdb by migrate - Upstream Django moved from syncdb to migrate in release 1.9. This fixes it. -Author: Thomas Goirand -Forwarded: no -Last-Update: 2015-12-23 - ---- python-django-bootstrap-form-3.1.0.orig/tests/__init__.py -+++ python-django-bootstrap-form-3.1.0/tests/__init__.py -@@ -41,7 +41,7 @@ class ExampleForm(forms.Form): - - class BootstrapTemplateTagTests(TestCase): - def setUp(self): -- call_command('syncdb', interactive=False) -+ call_command('migrate', interactive=False) - self.maxDiff = None - - @classmethod diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 4f953af..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -0001-Add-django.setup-for-Django-1.7-compatibility.patch -0002-Fix-test-case-for-Django-1.7-s-addition-of-an-id-att.patch -0003-replace-syncdb-by-migrate.patch