[Python-modules-commits] [django-pipeline] 04/06: Update patches

[Brian May]

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

bam pushed a commit to branch debian/master
in repository django-pipeline.

commit 342278aae221f473d549ee3b3e864e041ab13670
Author: Brian May <bam at debian.org>
Date:   Sun Jul 2 19:49:44 2017 +1000

    Update patches
---
 debian/patches/0001-Remove-slimit-test.patch          |  5 ++---
 debian/patches/0002-Change-default-compressors.patch  |  3 +--
 ...Define-kwarg_name-in-pipeline_settings-class.patch | 19 ++++++++++---------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/debian/patches/0001-Remove-slimit-test.patch b/debian/patches/0001-Remove-slimit-test.patch
index cf12081..9d77ecf 100644
--- a/debian/patches/0001-Remove-slimit-test.patch
+++ b/debian/patches/0001-Remove-slimit-test.patch
@@ -1,4 +1,3 @@
-From e0ea5919780c975e959e0754d186a2c58096515a Mon Sep 17 00:00:00 2001
 From: Brian May <bam at debian.org>
 Date: Thu, 24 Mar 2016 09:03:33 +1100
 Subject: Remove slimit test
@@ -10,10 +9,10 @@ any more. Use jsmin instead.
  1 file changed, 4 deletions(-)
 
 diff --git a/tests/tests/test_compressor.py b/tests/tests/test_compressor.py
-index 4291b51..bd75504 100644
+index f774373..5446ee9 100644
 --- a/tests/tests/test_compressor.py
 +++ b/tests/tests/test_compressor.py
-@@ -225,10 +225,6 @@ class CompressorImplementationTest(TestCase):
+@@ -228,10 +228,6 @@ class CompressorImplementationTest(TestCase):
          self._test_compressor('pipeline.compressors.jsmin.JSMinCompressor',
              'js', 'pipeline/compressors/jsmin.js')
  
diff --git a/debian/patches/0002-Change-default-compressors.patch b/debian/patches/0002-Change-default-compressors.patch
index 1e4cb6c..fabe903 100644
--- a/debian/patches/0002-Change-default-compressors.patch
+++ b/debian/patches/0002-Change-default-compressors.patch
@@ -1,4 +1,3 @@
-From e4b97bb92c2b60eace913fc18e0a23fc44d04b9c Mon Sep 17 00:00:00 2001
 From: Brian May <bam at debian.org>
 Date: Thu, 24 Mar 2016 09:14:37 +1100
 Subject: Change default compressors
@@ -9,7 +8,7 @@ Replace default compressors with compressors available in Debian main.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/pipeline/conf.py b/pipeline/conf.py
-index b6dd5b7..6d51b65 100644
+index 085a1e2..26f9cb0 100644
 --- a/pipeline/conf.py
 +++ b/pipeline/conf.py
 @@ -25,8 +25,8 @@ DEFAULTS = {
diff --git a/debian/patches/0003-Define-kwarg_name-in-pipeline_settings-class.patch b/debian/patches/0003-Define-kwarg_name-in-pipeline_settings-class.patch
index 598918c..a0941ef 100644
--- a/debian/patches/0003-Define-kwarg_name-in-pipeline_settings-class.patch
+++ b/debian/patches/0003-Define-kwarg_name-in-pipeline_settings-class.patch
@@ -1,19 +1,20 @@
-Subject: Define kwarg_name in pipeline_settings class
-Author: Thomas Goirand <zigo at debian.org>
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/828653
+From: Thomas Goirand <zigo at debian.org>
 Date: Fri, 5 Aug 2016 11:30:38 +0000
-Last-Update: 2016-08-05
+Subject: Define kwarg_name in pipeline_settings class
+
+---
+ tests/utils.py | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/tests/utils.py b/tests/utils.py
-index bf1c7ca..c3501dc 100644
+index 15f5573..d8a838e 100644
 --- a/tests/utils.py
 +++ b/tests/utils.py
-@@ -16,6 +16,7 @@ def _(path):
+@@ -17,6 +17,7 @@ def _(path):
  
  
  class pipeline_settings(override_settings):
 +    kwarg_name = None
      def __init__(self, **kwargs):
-         self.options = {'PIPELINE': kwargs}
- 
+         if django.VERSION[:2] >= (1, 10):
+             # Django 1.10's override_settings inherits from TestContextDecorator

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