[Python-modules-commits] r34086 - in packages/django-filter/tags (7 files)

bam at users.alioth.debian.org bam at users.alioth.debian.org
Tue Sep 1 23:18:21 UTC 2015


    Date: Tuesday, September 1, 2015 @ 23:18:20
  Author: bam
Revision: 34086

[svn-buildpackage] Tagging django-filter 0.11.0-1

Added:
  packages/django-filter/tags/0.11.0-1/
  packages/django-filter/tags/0.11.0-1/debian/changelog
    (from rev 34085, packages/django-filter/trunk/debian/changelog)
  packages/django-filter/tags/0.11.0-1/debian/patches/fix_tests.patch
    (from rev 34085, packages/django-filter/trunk/debian/patches/fix_tests.patch)
  packages/django-filter/tags/0.11.0-1/debian/patches/series
    (from rev 34085, packages/django-filter/trunk/debian/patches/series)
Deleted:
  packages/django-filter/tags/0.11.0-1/debian/changelog
  packages/django-filter/tags/0.11.0-1/debian/patches/fix_django1.7
  packages/django-filter/tags/0.11.0-1/debian/patches/series

Deleted: packages/django-filter/tags/0.11.0-1/debian/changelog
===================================================================
--- packages/django-filter/trunk/debian/changelog	2015-08-23 23:09:56 UTC (rev 33965)
+++ packages/django-filter/tags/0.11.0-1/debian/changelog	2015-09-01 23:18:20 UTC (rev 34086)
@@ -1,85 +0,0 @@
-django-filter (0.9.2-1) unstable; urgency=medium
-
-  * New upstream version.
-  * Source package comes with prebuilt docs which include jquery.js and
-    underscore.js, so provide sources to keep Lintian happy. Note none of these
-    files are not used for the built Debian package.
-
- -- Brian May <bam at debian.org>  Fri, 10 Apr 2015 10:38:43 +1000
-
-django-filter (0.7-4) unstable; urgency=low
-
-  * Add patch to fix tests in Django 1.7. Closes: #755635.
-
- -- Brian May <bam at debian.org>  Mon, 11 Aug 2014 10:05:52 +1000
-
-django-filter (0.7-3) unstable; urgency=low
-
-  * Python3 package.
-
- -- Brian May <bam at debian.org>  Thu, 03 Jul 2014 13:55:03 +1000
-
-django-filter (0.7-1) unstable; urgency=low
-
-  * New upstream version.
-
- -- Brian May <bam at debian.org>  Fri, 04 Apr 2014 09:40:31 +1100
-
-django-filter (0.6-3) unstable; urgency=low
-
-  * python-django-filters-doc now has have Breaks+Replaces:
-    python-django-filter-doc (<< 0.6-2). Closes: #720046.
-
- -- Brian May <bam at debian.org>  Fri, 02 Aug 2013 15:47:04 +1000
-
-django-filter (0.6-2) unstable; urgency=low
-
-  * Rename python-django-filter to python-django-filters to make
-    it compliant with Debian Python policy.
-  * Provide transitional dummy package.
-
- -- Brian May <bam at debian.org>  Fri, 02 Aug 2013 11:42:17 +1000
-
-django-filter (0.6-1) unstable; urgency=low
-
-  [ Michael Fladischer ]
-  * New upstream release.
-  * Set DPMT as Uploaders.
-  * Switch to dh_python2.
-  * Bump Standards version to 3.9.4.
-  * Bump debhelper Build-Depends to >= 8.1.0~.
-  * Rename to python-django-filter, provide transitional dummy package
-  * Build documentation with sphinx and move it to separate package
-    python-django-filter-doc.
-  * Drop patches.
-  * Change short and long description.
-  * Make dependencies on python-django versioned.
-  * Drop debian/pycompat.
-  * Add X-Python-Version.
-  * Use DEP5 format for d/copyright.
-    django-filter.
-  * Add d/watch file.
-  * Move Homepage field to source section.
-
- -- Brian May <bam at debian.org>  Mon, 17 Jun 2013 13:53:11 +1000
-
-django-filter (0.5.3-3) unstable; urgency=low
-
-  * Clean out debian/patches/debian-changes-0.5.3-2 and fix FTBS.
-    Closes: #643092.
-  * Increase standards version to 3.9.2 from 3.9.1
-  * Add patch from upstream to make XMLField optional.
-
- -- Brian May <bam at debian.org>  Wed, 12 Oct 2011 09:50:46 +1100
-
-django-filter (0.5.3-2) unstable; urgency=low
-
-  * Remove redundant line from debian/rules.
-
- -- Brian May <bam at debian.org>  Fri, 08 Apr 2011 10:41:00 +1000
-
-django-filter (0.5.3-1) unstable; urgency=low
-
-  * Initial release. Closes: #619195.
-
- -- Brian May <bam at debian.org>  Mon, 28 Mar 2011 13:41:07 +1100

Copied: packages/django-filter/tags/0.11.0-1/debian/changelog (from rev 34085, packages/django-filter/trunk/debian/changelog)
===================================================================
--- packages/django-filter/tags/0.11.0-1/debian/changelog	                        (rev 0)
+++ packages/django-filter/tags/0.11.0-1/debian/changelog	2015-09-01 23:18:20 UTC (rev 34086)
@@ -0,0 +1,94 @@
+django-filter (0.11.0-1) unstable; urgency=medium
+
+  * New upstream version.
+  * Add fix_tests.patch, applied upstream see
+    https://github.com/alex/django-filter/pull/287
+    Closes: #796754: FTBFS: test_filtering_uses_distinct raises AttributeError
+
+ -- Brian May <bam at debian.org>  Mon, 24 Aug 2015 11:52:41 +1000
+
+django-filter (0.9.2-1) unstable; urgency=medium
+
+  * New upstream version.
+  * Source package comes with prebuilt docs which include jquery.js and
+    underscore.js, so provide sources to keep Lintian happy. Note none of these
+    files are not used for the built Debian package.
+
+ -- Brian May <bam at debian.org>  Fri, 10 Apr 2015 10:38:43 +1000
+
+django-filter (0.7-4) unstable; urgency=low
+
+  * Add patch to fix tests in Django 1.7. Closes: #755635.
+
+ -- Brian May <bam at debian.org>  Mon, 11 Aug 2014 10:05:52 +1000
+
+django-filter (0.7-3) unstable; urgency=low
+
+  * Python3 package.
+
+ -- Brian May <bam at debian.org>  Thu, 03 Jul 2014 13:55:03 +1000
+
+django-filter (0.7-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Brian May <bam at debian.org>  Fri, 04 Apr 2014 09:40:31 +1100
+
+django-filter (0.6-3) unstable; urgency=low
+
+  * python-django-filters-doc now has have Breaks+Replaces:
+    python-django-filter-doc (<< 0.6-2). Closes: #720046.
+
+ -- Brian May <bam at debian.org>  Fri, 02 Aug 2013 15:47:04 +1000
+
+django-filter (0.6-2) unstable; urgency=low
+
+  * Rename python-django-filter to python-django-filters to make
+    it compliant with Debian Python policy.
+  * Provide transitional dummy package.
+
+ -- Brian May <bam at debian.org>  Fri, 02 Aug 2013 11:42:17 +1000
+
+django-filter (0.6-1) unstable; urgency=low
+
+  [ Michael Fladischer ]
+  * New upstream release.
+  * Set DPMT as Uploaders.
+  * Switch to dh_python2.
+  * Bump Standards version to 3.9.4.
+  * Bump debhelper Build-Depends to >= 8.1.0~.
+  * Rename to python-django-filter, provide transitional dummy package
+  * Build documentation with sphinx and move it to separate package
+    python-django-filter-doc.
+  * Drop patches.
+  * Change short and long description.
+  * Make dependencies on python-django versioned.
+  * Drop debian/pycompat.
+  * Add X-Python-Version.
+  * Use DEP5 format for d/copyright.
+    django-filter.
+  * Add d/watch file.
+  * Move Homepage field to source section.
+
+ -- Brian May <bam at debian.org>  Mon, 17 Jun 2013 13:53:11 +1000
+
+django-filter (0.5.3-3) unstable; urgency=low
+
+  * Clean out debian/patches/debian-changes-0.5.3-2 and fix FTBS.
+    Closes: #643092.
+  * Increase standards version to 3.9.2 from 3.9.1
+  * Add patch from upstream to make XMLField optional.
+
+ -- Brian May <bam at debian.org>  Wed, 12 Oct 2011 09:50:46 +1100
+
+django-filter (0.5.3-2) unstable; urgency=low
+
+  * Remove redundant line from debian/rules.
+
+ -- Brian May <bam at debian.org>  Fri, 08 Apr 2011 10:41:00 +1000
+
+django-filter (0.5.3-1) unstable; urgency=low
+
+  * Initial release. Closes: #619195.
+
+ -- Brian May <bam at debian.org>  Mon, 28 Mar 2011 13:41:07 +1100

Deleted: packages/django-filter/tags/0.11.0-1/debian/patches/fix_django1.7
===================================================================
--- packages/django-filter/trunk/debian/patches/fix_django1.7	2015-08-23 23:09:56 UTC (rev 33965)
+++ packages/django-filter/tags/0.11.0-1/debian/patches/fix_django1.7	2015-09-01 23:18:20 UTC (rev 34086)
@@ -1,66 +0,0 @@
-Index: django-filter/tests/models.py
-===================================================================
---- django-filter.orig/tests/models.py	2013-08-10 20:35:09.000000000 +1000
-+++ django-filter/tests/models.py	2014-08-11 10:00:33.823184110 +1000
-@@ -1,5 +1,6 @@
- from __future__ import absolute_import
- from __future__ import unicode_literals
-+from django.utils.encoding import python_2_unicode_compatible
- 
- ### these models are for testing
- from django import forms
-@@ -38,6 +39,7 @@
-         return super(SubnetMaskField, self).formfield(**defaults)
- 
- 
-+ at python_2_unicode_compatible
- class User(models.Model):
-     username = models.CharField(max_length=255)
-     first_name = SubCharField(max_length=100)
-@@ -49,18 +51,20 @@
- 
-     favorite_books = models.ManyToManyField('Book', related_name='lovers')
- 
--    def __unicode__(self):
-+    def __str__(self):
-         return self.username
- 
- 
-+ at python_2_unicode_compatible
- class AdminUser(User):
-     class Meta:
-         proxy = True
- 
--    def __unicode__(self):
-+    def __str__(self):
-         return "%s (ADMIN)" % self.username
- 
- 
-+ at python_2_unicode_compatible
- class Comment(models.Model):
-     text = models.TextField()
-     author = models.ForeignKey(User, related_name='comments')
-@@ -68,7 +72,7 @@
-     date = models.DateField()
-     time = models.TimeField()
- 
--    def __unicode__(self):
-+    def __str__(self):
-         return "%s said %s" % (self.author, self.text[:25])
- 
- 
-@@ -77,12 +81,13 @@
-     author = models.ForeignKey(User, null=True)
- 
- 
-+ at python_2_unicode_compatible
- class Book(models.Model):
-     title = models.CharField(max_length=100)
-     price = models.DecimalField(max_digits=6, decimal_places=2)
-     average_rating = models.FloatField()
- 
--    def __unicode__(self):
-+    def __str__(self):
-         return self.title
- 
- 

Copied: packages/django-filter/tags/0.11.0-1/debian/patches/fix_tests.patch (from rev 34085, packages/django-filter/trunk/debian/patches/fix_tests.patch)
===================================================================
--- packages/django-filter/tags/0.11.0-1/debian/patches/fix_tests.patch	                        (rev 0)
+++ packages/django-filter/tags/0.11.0-1/debian/patches/fix_tests.patch	2015-09-01 23:18:20 UTC (rev 34086)
@@ -0,0 +1,28 @@
+Index: django-filter/django_filters/filters.py
+===================================================================
+--- django-filter.orig/django_filters/filters.py
++++ django-filter/django_filters/filters.py
+@@ -84,9 +84,9 @@ class Filter(object):
+             lookup = self.lookup_type
+         if value in ([], (), {}, None, ''):
+             return qs
+-        qs = self.get_method(qs)(**{'%s__%s' % (self.name, lookup): value})
+         if self.distinct:
+             qs = qs.distinct()
++        qs = self.get_method(qs)(**{'%s__%s' % (self.name, lookup): value})
+         return qs
+ 
+ 
+Index: django-filter/tests/test_filters.py
+===================================================================
+--- django-filter.orig/tests/test_filters.py
++++ django-filter/tests/test_filters.py
+@@ -189,7 +189,7 @@ class FilterTests(TestCase):
+         qs = mock.Mock(spec=['filter', 'distinct'])
+         f = Filter(name='somefield', distinct=True)
+         f.filter(qs, 'value')
+-        result = qs.distinct.assert_called_once()
++        result = qs.distinct.assert_called_once_with()
+         self.assertNotEqual(qs, result)
+ 
+ 

Deleted: packages/django-filter/tags/0.11.0-1/debian/patches/series
===================================================================
Copied: packages/django-filter/tags/0.11.0-1/debian/patches/series (from rev 34085, packages/django-filter/trunk/debian/patches/series)
===================================================================
--- packages/django-filter/tags/0.11.0-1/debian/patches/series	                        (rev 0)
+++ packages/django-filter/tags/0.11.0-1/debian/patches/series	2015-09-01 23:18:20 UTC (rev 34086)
@@ -0,0 +1 @@
+fix_tests.patch




More information about the Python-modules-commits mailing list