[Python-modules-commits] [django-pipeline] 05/06: merge patched into master

[Brian May]

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

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

commit 099019b647205b9d3afa2e09efc3e268bbd05e4d
Merge: e0c95ab e4b97bb
Author: Brian May <bam at debian.org>
Date:   Wed Apr 6 12:50:15 2016 +1000

    merge patched into master

 AUTHORS                                            |  2 +
 HISTORY.rst                                        | 12 ++++
 PKG-INFO                                           | 16 ++++-
 README.rst                                         |  2 +-
 debian/.git-dpm                                    |  6 +-
 debian/patches/0001-Remove-slimit-test.patch       |  2 +-
 .../patches/0002-Change-default-compressors.patch  |  2 +-
 django_pipeline.egg-info/PKG-INFO                  | 16 ++++-
 docs/conf.py                                       |  2 +-
 pipeline/compilers/__init__.py                     |  7 +-
 pipeline/templatetags/pipeline.py                  | 75 ++++++++++++++++------
 setup.cfg                                          |  2 +-
 setup.py                                           |  2 +-
 13 files changed, 111 insertions(+), 35 deletions(-)

diff --cc debian/.git-dpm
index 29d4d1a,0000000..79e7264
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 827d360434ee55dd6d151a478a301e1fe4c133c5
- 827d360434ee55dd6d151a478a301e1fe4c133c5
- 5df2e5effab5025dcdd8f9b53e05f7c4c3eff9d8
++e4b97bb92c2b60eace913fc18e0a23fc44d04b9c
++e4b97bb92c2b60eace913fc18e0a23fc44d04b9c
++a6e05d2f0d2ddbb4a6554def26c0571761315ab3
 +a6e05d2f0d2ddbb4a6554def26c0571761315ab3
 +django-pipeline_1.6.8.orig.tar.gz
 +2876cf4711198c5454849289db2c12ea40047a81
 +52932
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-slimit-test.patch
index eec1b27,0000000..cf12081
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-slimit-test.patch
+++ b/debian/patches/0001-Remove-slimit-test.patch
@@@ -1,26 -1,0 +1,26 @@@
- From b1574b94ca397c39de337fdb970d893f9c4f28f5 Mon Sep 17 00:00:00 2001
++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
 +
 +slimit is not Python 3 compatible and not maintained upstream
 +any more. Use jsmin instead.
 +---
 + tests/tests/test_compressor.py | 4 ----
 + 1 file changed, 4 deletions(-)
 +
 +diff --git a/tests/tests/test_compressor.py b/tests/tests/test_compressor.py
 +index 4291b51..bd75504 100644
 +--- a/tests/tests/test_compressor.py
 ++++ b/tests/tests/test_compressor.py
 +@@ -225,10 +225,6 @@ class CompressorImplementationTest(TestCase):
 +         self._test_compressor('pipeline.compressors.jsmin.JSMinCompressor',
 +             'js', 'pipeline/compressors/jsmin.js')
 + 
 +-    def test_slimit(self):
 +-        self._test_compressor('pipeline.compressors.slimit.SlimItCompressor',
 +-            'js', 'pipeline/compressors/slimit.js')
 +-
 +     @skipUnless(settings.HAS_NODE, "requires node")
 +     def test_uglifyjs(self):
 +         self._test_compressor('pipeline.compressors.uglifyjs.UglifyJSCompressor',
diff --cc debian/patches/0002-Change-default-compressors.patch
index 4406145,0000000..1e4cb6c
mode 100644,000000..100644
--- a/debian/patches/0002-Change-default-compressors.patch
+++ b/debian/patches/0002-Change-default-compressors.patch
@@@ -1,25 -1,0 +1,25 @@@
- From 827d360434ee55dd6d151a478a301e1fe4c133c5 Mon Sep 17 00:00:00 2001
++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
 +
 +Replace default compressors with compressors available in Debian main.
 +---
 + pipeline/conf.py | 4 ++--
 + 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/pipeline/conf.py b/pipeline/conf.py
 +index b6dd5b7..6d51b65 100644
 +--- a/pipeline/conf.py
 ++++ b/pipeline/conf.py
 +@@ -25,8 +25,8 @@ DEFAULTS = {
 + 
 +     'SHOW_ERRORS_INLINE': _settings.DEBUG,
 + 
 +-    'CSS_COMPRESSOR': 'pipeline.compressors.yuglify.YuglifyCompressor',
 +-    'JS_COMPRESSOR': 'pipeline.compressors.yuglify.YuglifyCompressor',
 ++    'CSS_COMPRESSOR': 'pipeline.compressors.cssmin.CSSMinCompressor',
 ++    'JS_COMPRESSOR': 'pipeline.compressors.jsmin.JSMinCompressor',
 +     'COMPILERS': [],
 + 
 +     'STYLESHEETS': {},

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