[Python-modules-commits] [django-pipeline] 04/07: merge patched into master
Brian May
bam at moszumanska.debian.org
Sun Jan 3 02:44:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository django-pipeline.
commit d612ba8ece7fc31eb158efcfb803da086115d98e
Merge: ae91bea e57248c
Author: Brian May <bam at debian.org>
Date: Sun Jan 3 12:37:23 2016 +1100
merge patched into master
AUTHORS | 2 +
HISTORY.rst | 35 +-
PKG-INFO | 39 +-
debian/.git-dpm | 6 +-
debian/patches/make_jsmin_optional | 2 +-
django_pipeline.egg-info/PKG-INFO | 39 +-
django_pipeline.egg-info/SOURCES.txt | 77 +-
django_pipeline.egg-info/pbr.json | 1 -
docs/compilers.rst | 52 +-
docs/compressors.rst | 80 +-
docs/conf.py | 4 +-
docs/configuration.rst | 204 +-
docs/index.rst | 5 +-
docs/installation.rst | 11 +-
docs/storages.rst | 2 +-
docs/templates.rst | 42 +-
docs/usage.rst | 16 +-
docs/using.rst | 6 +-
pipeline/compilers/__init__.py | 80 +-
pipeline/compilers/coffee.py | 10 +-
pipeline/compilers/es6.py | 7 +-
pipeline/compilers/less.py | 9 +-
pipeline/compilers/livescript.py | 10 +-
pipeline/compilers/sass.py | 6 +-
pipeline/compilers/stylus.py | 6 +-
pipeline/compressors/__init__.py | 34 +-
pipeline/compressors/closure.py | 2 +-
pipeline/compressors/cssmin.py | 2 +-
pipeline/compressors/csstidy.py | 7 +-
pipeline/compressors/uglifyjs.py | 2 +-
pipeline/compressors/yuglify.py | 10 +-
pipeline/compressors/yui.py | 10 +-
pipeline/conf.py | 138 +-
pipeline/finders.py | 4 +-
.../{templatetags/ext.py => jinja2/__init__.py} | 2 +-
pipeline/manifest.py | 4 +-
pipeline/packager.py | 8 +-
pipeline/templatetags/pipeline.py | 13 +-
pipeline/utils.py | 2 +-
setup.py | 4 +-
tests/settings.py | 137 +-
tests/static/admin/css/base.css | 555 +--
tests/static/admin/css/changelists.css | 212 +-
tests/static/admin/css/fonts.css | 20 +
tests/static/admin/css/forms.css | 233 +-
tests/static/admin/css/ie.css | 63 -
tests/static/admin/css/login.css | 40 +-
tests/static/admin/css/rtl.css | 86 +-
tests/static/admin/css/widgets.css | 431 +--
tests/static/admin/fonts/LICENSE.txt | 202 +
tests/static/admin/fonts/README.txt | 2 +
tests/static/admin/fonts/Roboto-Bold-webfont.woff | Bin 0 -> 82564 bytes
tests/static/admin/fonts/Roboto-Light-webfont.woff | Bin 0 -> 81348 bytes
.../static/admin/fonts/Roboto-Regular-webfont.woff | Bin 0 -> 80304 bytes
tests/static/admin/img/LICENSE | 20 +
tests/static/admin/img/README.txt | 7 +
tests/static/admin/img/calendar-icons.svg | 14 +
tests/static/admin/img/changelist-bg.gif | Bin 50 -> 0 bytes
tests/static/admin/img/changelist-bg_rtl.gif | Bin 75 -> 0 bytes
tests/static/admin/img/default-bg-reverse.gif | Bin 835 -> 0 bytes
tests/static/admin/img/default-bg.gif | Bin 836 -> 0 bytes
tests/static/admin/img/deleted-overlay.gif | Bin 45 -> 0 bytes
tests/static/admin/img/gis/move_vertex_off.png | Bin 711 -> 0 bytes
tests/static/admin/img/gis/move_vertex_off.svg | 1 +
tests/static/admin/img/gis/move_vertex_on.png | Bin 506 -> 0 bytes
tests/static/admin/img/gis/move_vertex_on.svg | 1 +
tests/static/admin/img/icon-addlink.svg | 3 +
tests/static/admin/img/icon-alert.svg | 3 +
tests/static/admin/img/icon-calendar.svg | 9 +
tests/static/admin/img/icon-changelink.svg | 3 +
tests/static/admin/img/icon-clock.svg | 9 +
tests/static/admin/img/icon-deletelink.svg | 3 +
tests/static/admin/img/icon-no.gif | Bin 176 -> 0 bytes
tests/static/admin/img/icon-no.svg | 3 +
tests/static/admin/img/icon-unknown-alt.svg | 3 +
tests/static/admin/img/icon-unknown.gif | Bin 130 -> 0 bytes
tests/static/admin/img/icon-unknown.svg | 3 +
tests/static/admin/img/icon-yes.gif | Bin 299 -> 0 bytes
tests/static/admin/img/icon-yes.svg | 3 +
tests/static/admin/img/icon_addlink.gif | Bin 119 -> 0 bytes
tests/static/admin/img/icon_alert.gif | Bin 145 -> 0 bytes
tests/static/admin/img/icon_calendar.gif | Bin 192 -> 0 bytes
tests/static/admin/img/icon_changelink.gif | Bin 119 -> 0 bytes
tests/static/admin/img/icon_clock.gif | Bin 390 -> 0 bytes
tests/static/admin/img/icon_deletelink.gif | Bin 181 -> 0 bytes
tests/static/admin/img/icon_error.gif | Bin 319 -> 0 bytes
tests/static/admin/img/icon_searchbox.png | Bin 368 -> 0 bytes
tests/static/admin/img/icon_success.gif | Bin 341 -> 0 bytes
tests/static/admin/img/inline-delete-8bit.png | Bin 395 -> 0 bytes
tests/static/admin/img/inline-delete.png | Bin 707 -> 0 bytes
tests/static/admin/img/inline-delete.svg | 3 +
tests/static/admin/img/inline-restore-8bit.png | Bin 363 -> 0 bytes
tests/static/admin/img/inline-restore.png | Bin 557 -> 0 bytes
tests/static/admin/img/inline-splitter-bg.gif | Bin 94 -> 0 bytes
tests/static/admin/img/nav-bg-grabber.gif | Bin 116 -> 0 bytes
tests/static/admin/img/nav-bg-reverse.gif | Bin 178 -> 0 bytes
tests/static/admin/img/nav-bg-selected.gif | Bin 265 -> 0 bytes
tests/static/admin/img/nav-bg.gif | Bin 265 -> 0 bytes
tests/static/admin/img/search.svg | 3 +
tests/static/admin/img/selector-icons.gif | Bin 2771 -> 0 bytes
tests/static/admin/img/selector-icons.svg | 34 +
tests/static/admin/img/selector-search.gif | Bin 552 -> 0 bytes
tests/static/admin/img/sorting-icons.gif | Bin 369 -> 0 bytes
tests/static/admin/img/sorting-icons.svg | 19 +
tests/static/admin/img/tooltag-add.png | Bin 119 -> 0 bytes
tests/static/admin/img/tooltag-add.svg | 3 +
tests/static/admin/img/tooltag-arrowright.png | Bin 200 -> 0 bytes
tests/static/admin/img/tooltag-arrowright.svg | 3 +
tests/static/admin/js/SelectBox.js | 229 +-
tests/static/admin/js/SelectFilter2.js | 336 +-
tests/static/admin/js/actions.js | 284 +-
tests/static/admin/js/actions.min.js | 8 +-
tests/static/admin/js/admin/DateTimeShortcuts.js | 655 ++--
.../static/admin/js/admin/RelatedObjectLookups.js | 287 +-
tests/static/admin/js/calendar.js | 303 +-
tests/static/admin/js/collapse.js | 46 +-
tests/static/admin/js/collapse.min.js | 4 +-
tests/static/admin/js/core.js | 223 +-
tests/static/admin/js/inlines.js | 471 +--
tests/static/admin/js/inlines.min.js | 18 +-
tests/static/admin/js/jquery.init.js | 1 +
tests/static/admin/js/jquery.min.js | 4 -
tests/static/admin/js/prepopulate.js | 9 +-
tests/static/admin/js/prepopulate.min.js | 2 +-
tests/static/admin/js/related-widget-wrapper.js | 23 -
tests/static/admin/js/timeparse.js | 168 +-
tests/static/admin/js/urlify.js | 300 +-
.../js/{ => vendor/jquery}/LICENSE-JQUERY.txt | 16 +-
.../static/admin/js/{ => vendor/jquery}/jquery.js | 4092 +++++++-------------
tests/static/admin/js/vendor/jquery/jquery.min.js | 4 +
.../admin/js/vendor/xregexp/LICENSE-XREGEXP.txt | 21 +
.../static/admin/js/vendor/xregexp/xregexp.min.js | 18 +
tests/static/scripts_async.js | 3 +
tests/static/scripts_async_defer.js | 3 +
tests/static/scripts_defer.js | 3 +
tests/tests/test_compiler.py | 132 +-
tests/tests/test_compressor.py | 51 +-
tests/tests/test_conf.py | 32 +
tests/tests/test_glob.py | 47 +-
tests/tests/test_storage.py | 69 +-
tests/tests/test_template.py | 10 +-
tests/utils.py | 17 +-
142 files changed, 5465 insertions(+), 5548 deletions(-)
diff --cc debian/.git-dpm
index e778a5b,0000000..c7b79fa
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
- f5abe25112b4613fd66e8121dba9f08213461d2d
- f5abe25112b4613fd66e8121dba9f08213461d2d
- bcbbd3936b0c8ecab23db0ecbdfe569a9a6b3a10
++e57248ca545fb290aae3baa36398d9209e4ab16b
++e57248ca545fb290aae3baa36398d9209e4ab16b
++bb4f66f4ed05a786ea05c8ad0af1888db1d043ba
+bb4f66f4ed05a786ea05c8ad0af1888db1d043ba
+django-pipeline_1.6.4.orig.tar.gz
+d38db7045b69585d2c992b7b1a6ba11d85e64ec4
+457637
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/make_jsmin_optional
index 7ec6bbd,0000000..abbeef9
mode 100644,000000..100644
--- a/debian/patches/make_jsmin_optional
+++ b/debian/patches/make_jsmin_optional
@@@ -1,33 -1,0 +1,33 @@@
- From f5abe25112b4613fd66e8121dba9f08213461d2d Mon Sep 17 00:00:00 2001
++From e57248ca545fb290aae3baa36398d9209e4ab16b Mon Sep 17 00:00:00 2001
+From: Dmitry Nezhevenko <dion at dion.org.ua>
+Date: Thu, 8 Oct 2015 08:55:54 -0700
+Subject: Make JSMin dependency optional
+
+ JSMin is a JavaScript compressor. It's known to be non-free due to
+ additional statement to MIT license (The Software shall be used for Good,
+ not Evil.)
+ .
+ This patchs stubs out JSMin usage. Instead uncompressed JS will be
+ returned. This should be ok since it is not default compressor at all.
+Bug: https://github.com/cyberdelia/django-pipeline/issues/99
+Patch-Name: make_jsmin_optional
+---
+ pipeline/compressors/jsmin.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/pipeline/compressors/jsmin.py b/pipeline/compressors/jsmin.py
+index dd1fc73..3ed6c66 100644
+--- a/pipeline/compressors/jsmin.py
++++ b/pipeline/compressors/jsmin.py
+@@ -9,5 +9,9 @@ class JSMinCompressor(CompressorBase):
+ (http://pypi.python.org/pypi/jsmin/).
+ """
+ def compress_js(self, js):
+- from jsmin import jsmin
+- return jsmin(js)
++ try:
++ from jsmin import jsmin
++ return jsmin(js)
++ except ImportError:
++ # JSMin is not available
++ return js
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-pipeline.git
More information about the Python-modules-commits
mailing list