[Python-modules-commits] [django-pipeline] 01/01: Convert from git-dpm to patches unapplied format

[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 d0d9717cca174bc8629c39f2447f502b5429b77b
Author: Brian May <bam at moszumanska.debian.org>
Date:   Sun Jul 2 09:42:54 2017 +0000

    Convert from git-dpm to patches unapplied format
---
 debian/.git-dpm                | 11 -----------
 debian/gbp.conf                |  2 ++
 pipeline/conf.py               |  4 ++--
 tests/tests/test_compressor.py |  4 ++++
 tests/utils.py                 |  1 -
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index a2dd8fb..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-e6c9304cf992e554867f46b51baa277aa9c8031d
-e6c9304cf992e554867f46b51baa277aa9c8031d
-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 --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..3879982
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/master
diff --git a/pipeline/conf.py b/pipeline/conf.py
index 6d51b65..b6dd5b7 100644
--- a/pipeline/conf.py
+++ b/pipeline/conf.py
@@ -25,8 +25,8 @@ DEFAULTS = {
 
     'SHOW_ERRORS_INLINE': _settings.DEBUG,
 
-    'CSS_COMPRESSOR': 'pipeline.compressors.cssmin.CSSMinCompressor',
-    'JS_COMPRESSOR': 'pipeline.compressors.jsmin.JSMinCompressor',
+    'CSS_COMPRESSOR': 'pipeline.compressors.yuglify.YuglifyCompressor',
+    'JS_COMPRESSOR': 'pipeline.compressors.yuglify.YuglifyCompressor',
     'COMPILERS': [],
 
     'STYLESHEETS': {},
diff --git a/tests/tests/test_compressor.py b/tests/tests/test_compressor.py
index bd75504..4291b51 100644
--- a/tests/tests/test_compressor.py
+++ b/tests/tests/test_compressor.py
@@ -225,6 +225,10 @@ 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 --git a/tests/utils.py b/tests/utils.py
index c3501dc..bf1c7ca 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -16,7 +16,6 @@ def _(path):
 
 
 class pipeline_settings(override_settings):
-    kwarg_name = None
     def __init__(self, **kwargs):
         self.options = {'PIPELINE': kwargs}
 

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