[Python-modules-commits] [django-pipeline] 02/11: 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 457a5eaad6f07cb696e8da442f52d9ba22ab5937
Merge: 56c928b ab93986
Author: Brian May <bam at debian.org>
Date:   Thu Mar 24 09:05:40 2016 +1100

    merge patched into master

 debian/.git-dpm                              |  4 ++--
 debian/patches/0002-Remove-slimit-test.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 tests/tests/test_compressor.py               |  4 ----
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 99b23bc,0000000..93628ce
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
- 96b2c88a16df4ae37176323b6dca092de073f3dd
- 96b2c88a16df4ae37176323b6dca092de073f3dd
++ab939863f0d121e4571884fbc0163a240222266a
++ab939863f0d121e4571884fbc0163a240222266a
 +5df2e5effab5025dcdd8f9b53e05f7c4c3eff9d8
 +5df2e5effab5025dcdd8f9b53e05f7c4c3eff9d8
 +django-pipeline_1.6.7.orig.tar.gz
 +2bbee1c89eaea4cd7034eaf554c9b175e4b86493
 +52198
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Remove-slimit-test.patch
index 0000000,0000000..82d112c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Remove-slimit-test.patch
@@@ -1,0 -1,0 +1,26 @@@
++From ab939863f0d121e4571884fbc0163a240222266a 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/series
index 364b6af,0000000..a356edb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +make_jsmin_optional
++0002-Remove-slimit-test.patch

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