[Python-modules-commits] [django-pipeline] 01/07: Import django-pipeline_1.6.4.orig.tar.gz

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 bb4f66f4ed05a786ea05c8ad0af1888db1d043ba
Author: Brian May <bam at debian.org>
Date:   Sun Jan 3 12:36:55 2016 +1100

    Import django-pipeline_1.6.4.orig.tar.gz
---
 AUTHORS                                            |    2 +
 HISTORY.rst                                        |   35 +-
 PKG-INFO                                           |   39 +-
 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 +-
 140 files changed, 5461 insertions(+), 5544 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 59ac2e7..41a758b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,6 +28,7 @@ or just made Pipeline more awesome.
  * Camilo Nova <camilo.nova at gmail.com>
  * Carl Meyer <carl at oddbird.net>
  * Casey Greene <csgreene at princeton.edu>
+ * Chad Miller <chad.miller at canonical.com>
  * Chris Applegate <chris.applegate at wearesocial.net>
  * Chris Reeves <hello at chris.reeves.io>
  * Christian Hammond <chipx86 at chipx86.com>
@@ -88,6 +89,7 @@ or just made Pipeline more awesome.
  * Sayed Raianul Kabir <raian at newscred.com>
  * Simon Lydell <simon.lydell at gmail.com>
  * Sirex <sirexas at gmail.com>
+ * Sławek Ehlert <slafs at op.pl>
  * Stefano Brentegani <sbrentegani at gmail.com>
  * Stephan Wienczny <stephan at wienczny.de>
  * Steven Cummings <estebistec at gmail.com>
diff --git a/HISTORY.rst b/HISTORY.rst
index e98a7dc..775aa1b 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,39 +3,32 @@
 History
 =======
 
-1.5.4
+1.6.4
 =====
 
-* Stop returning gzipped file when using GZIPMixin.
-* Fix jinja templates packaging.
+* Fix compressor subprocess calls.
 
-1.5.3
+1.6.3
 =====
 
-* Fix futures import. Thanks to Mathieu Gallet.
-* Make GZIPMixin returns the gziped file.
-* Fix import shadowing. Thanks to Christofer Bertonha.
-* Fix tests settings for Django 1.9. Thanks to Leonardo Orozco.
-* Improve javascript concatenation. Thanks to Simon Lydell and Alex Gavrișco.
-* Improve finder logic. Thanks to Nathan Shafer and James Keys.
-* Documentation fix. Thanks to Stefano Brentegani.
+* Fix compressor command flattening.
 
-1.5.2
+1.6.2
 =====
 
-* Use smart_bytes and smart_text appropriately. Thanks to Tadas Dailyda.
-* Fix outdated logic. Thanks to Tadas Dailyda.
+* Remove subprocess32 usage since it breaks universal support.
 
-1.5.1
+1.6.1
 =====
 
-* Prevent collecting all static multiple times per request. Thanks to Allard Stijnman.
-* Fix encoding issues. Thanks to Leonardo Orozco.
-* Improve Django 1.8. Thanks to Carl Meyer.
+* Fix path quoting issues. Thanks to Chad Miller.
+* Use subprocess32 package when possible.
+* Documentation fixes. Thanks to Sławek Ehlert and Jannis Leidel.
 
-1.5.0
+1.6.0
 =====
 
-* Add full support for Django 1.8.
-* Drop support for Django 1.6.
+* Add full support for Django 1.9.
+* Drop support for Django 1.7.
 * Drop support for Python 2.6.
+* **BACKWARD INCOMPATIBLE** : Change configuration settings.
diff --git a/PKG-INFO b/PKG-INFO
index ec12ed9..c9173ca 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,8 +1,8 @@
 Metadata-Version: 1.1
 Name: django-pipeline
-Version: 1.5.4
+Version: 1.6.4
 Summary: Pipeline is an asset packaging library for Django.
-Home-page: https://github.com/cyberdelia/django-pipeline
+Home-page: https://github.com/jazzband/django-pipeline
 Author: Timothée Peignier
 Author-email: timothee.peignier at tryphon.org
 License: MIT
@@ -33,42 +33,35 @@ Description: Pipeline
         History
         =======
         
-        1.5.4
+        1.6.4
         =====
         
-        * Stop returning gzipped file when using GZIPMixin.
-        * Fix jinja templates packaging.
+        * Fix compressor subprocess calls.
         
-        1.5.3
+        1.6.3
         =====
         
-        * Fix futures import. Thanks to Mathieu Gallet.
-        * Make GZIPMixin returns the gziped file.
-        * Fix import shadowing. Thanks to Christofer Bertonha.
-        * Fix tests settings for Django 1.9. Thanks to Leonardo Orozco.
-        * Improve javascript concatenation. Thanks to Simon Lydell and Alex Gavrișco.
-        * Improve finder logic. Thanks to Nathan Shafer and James Keys.
-        * Documentation fix. Thanks to Stefano Brentegani.
+        * Fix compressor command flattening.
         
-        1.5.2
+        1.6.2
         =====
         
-        * Use smart_bytes and smart_text appropriately. Thanks to Tadas Dailyda.
-        * Fix outdated logic. Thanks to Tadas Dailyda.
+        * Remove subprocess32 usage since it breaks universal support.
         
-        1.5.1
+        1.6.1
         =====
         
-        * Prevent collecting all static multiple times per request. Thanks to Allard Stijnman.
-        * Fix encoding issues. Thanks to Leonardo Orozco.
-        * Improve Django 1.8. Thanks to Carl Meyer.
+        * Fix path quoting issues. Thanks to Chad Miller.
+        * Use subprocess32 package when possible.
+        * Documentation fixes. Thanks to Sławek Ehlert and Jannis Leidel.
         
-        1.5.0
+        1.6.0
         =====
         
-        * Add full support for Django 1.8.
-        * Drop support for Django 1.6.
+        * Add full support for Django 1.9.
+        * Drop support for Django 1.7.
         * Drop support for Python 2.6.
+        * **BACKWARD INCOMPATIBLE** : Change configuration settings.
         
 Platform: UNKNOWN
 Classifier: Environment :: Web Environment
diff --git a/django_pipeline.egg-info/PKG-INFO b/django_pipeline.egg-info/PKG-INFO
index ec12ed9..c9173ca 100644
--- a/django_pipeline.egg-info/PKG-INFO
+++ b/django_pipeline.egg-info/PKG-INFO
@@ -1,8 +1,8 @@
 Metadata-Version: 1.1
 Name: django-pipeline
-Version: 1.5.4
+Version: 1.6.4
 Summary: Pipeline is an asset packaging library for Django.
-Home-page: https://github.com/cyberdelia/django-pipeline
+Home-page: https://github.com/jazzband/django-pipeline
 Author: Timothée Peignier
 Author-email: timothee.peignier at tryphon.org
 License: MIT
@@ -33,42 +33,35 @@ Description: Pipeline
         History
         =======
         
-        1.5.4
+        1.6.4
         =====
         
-        * Stop returning gzipped file when using GZIPMixin.
-        * Fix jinja templates packaging.
+        * Fix compressor subprocess calls.
         
-        1.5.3
+        1.6.3
         =====
         
-        * Fix futures import. Thanks to Mathieu Gallet.
-        * Make GZIPMixin returns the gziped file.
-        * Fix import shadowing. Thanks to Christofer Bertonha.
-        * Fix tests settings for Django 1.9. Thanks to Leonardo Orozco.
-        * Improve javascript concatenation. Thanks to Simon Lydell and Alex Gavrișco.
-        * Improve finder logic. Thanks to Nathan Shafer and James Keys.
-        * Documentation fix. Thanks to Stefano Brentegani.
+        * Fix compressor command flattening.
         
-        1.5.2
+        1.6.2
         =====
         
-        * Use smart_bytes and smart_text appropriately. Thanks to Tadas Dailyda.
-        * Fix outdated logic. Thanks to Tadas Dailyda.
+        * Remove subprocess32 usage since it breaks universal support.
         
-        1.5.1
+        1.6.1
         =====
         
-        * Prevent collecting all static multiple times per request. Thanks to Allard Stijnman.
-        * Fix encoding issues. Thanks to Leonardo Orozco.
-        * Improve Django 1.8. Thanks to Carl Meyer.
+        * Fix path quoting issues. Thanks to Chad Miller.
+        * Use subprocess32 package when possible.
+        * Documentation fixes. Thanks to Sławek Ehlert and Jannis Leidel.
         
-        1.5.0
+        1.6.0
         =====
         
-        * Add full support for Django 1.8.
-        * Drop support for Django 1.6.
+        * Add full support for Django 1.9.
+        * Drop support for Django 1.7.
         * Drop support for Python 2.6.
+        * **BACKWARD INCOMPATIBLE** : Change configuration settings.
         
 Platform: UNKNOWN
 Classifier: Environment :: Web Environment
diff --git a/django_pipeline.egg-info/SOURCES.txt b/django_pipeline.egg-info/SOURCES.txt
index 6ba5047..9684605 100644
--- a/django_pipeline.egg-info/SOURCES.txt
+++ b/django_pipeline.egg-info/SOURCES.txt
@@ -9,7 +9,6 @@ django_pipeline.egg-info/PKG-INFO
 django_pipeline.egg-info/SOURCES.txt
 django_pipeline.egg-info/dependency_links.txt
 django_pipeline.egg-info/not-zip-safe
-django_pipeline.egg-info/pbr.json
 django_pipeline.egg-info/requires.txt
 django_pipeline.egg-info/top_level.txt
 docs/Makefile
@@ -53,6 +52,7 @@ pipeline/compressors/slimit.py
 pipeline/compressors/uglifyjs.py
 pipeline/compressors/yuglify.py
 pipeline/compressors/yui.py
+pipeline/jinja2/__init__.py
 pipeline/jinja2/pipeline/css.jinja
 pipeline/jinja2/pipeline/inline_js.jinja
 pipeline/jinja2/pipeline/js.jinja
@@ -63,7 +63,6 @@ pipeline/templates/pipeline/inline_js.jinja
 pipeline/templates/pipeline/js.html
 pipeline/templates/pipeline/js.jinja
 pipeline/templatetags/__init__.py
-pipeline/templatetags/ext.py
 pipeline/templatetags/pipeline.py
 tests/__init__.py
 tests/models.py
@@ -92,48 +91,43 @@ tests/assets/templates/photo/list.jst
 tests/assets/templates/video/detail.jst
 tests/static/screen.css
 tests/static/scripts.js
+tests/static/scripts_async.js
+tests/static/scripts_async_defer.js
+tests/static/scripts_defer.js
 tests/static/admin/css/base.css
 tests/static/admin/css/changelists.css
 tests/static/admin/css/dashboard.css
+tests/static/admin/css/fonts.css
 tests/static/admin/css/forms.css
-tests/static/admin/css/ie.css
 tests/static/admin/css/login.css
 tests/static/admin/css/rtl.css
 tests/static/admin/css/widgets.css
-tests/static/admin/img/changelist-bg.gif
-tests/static/admin/img/changelist-bg_rtl.gif
-tests/static/admin/img/default-bg-reverse.gif
-tests/static/admin/img/default-bg.gif
-tests/static/admin/img/deleted-overlay.gif
-tests/static/admin/img/icon-no.gif
-tests/static/admin/img/icon-unknown.gif
-tests/static/admin/img/icon-yes.gif
-tests/static/admin/img/icon_addlink.gif
-tests/static/admin/img/icon_alert.gif
-tests/static/admin/img/icon_calendar.gif
-tests/static/admin/img/icon_changelink.gif
-tests/static/admin/img/icon_clock.gif
-tests/static/admin/img/icon_deletelink.gif
-tests/static/admin/img/icon_error.gif
-tests/static/admin/img/icon_searchbox.png
-tests/static/admin/img/icon_success.gif
-tests/static/admin/img/inline-delete-8bit.png
-tests/static/admin/img/inline-delete.png
-tests/static/admin/img/inline-restore-8bit.png
-tests/static/admin/img/inline-restore.png
-tests/static/admin/img/inline-splitter-bg.gif
-tests/static/admin/img/nav-bg-grabber.gif
-tests/static/admin/img/nav-bg-reverse.gif
-tests/static/admin/img/nav-bg-selected.gif
-tests/static/admin/img/nav-bg.gif
-tests/static/admin/img/selector-icons.gif
-tests/static/admin/img/selector-search.gif
-tests/static/admin/img/sorting-icons.gif
-tests/static/admin/img/tooltag-add.png
-tests/static/admin/img/tooltag-arrowright.png
-tests/static/admin/img/gis/move_vertex_off.png
-tests/static/admin/img/gis/move_vertex_on.png
-tests/static/admin/js/LICENSE-JQUERY.txt
+tests/static/admin/fonts/LICENSE.txt
+tests/static/admin/fonts/README.txt
+tests/static/admin/fonts/Roboto-Bold-webfont.woff
+tests/static/admin/fonts/Roboto-Light-webfont.woff
+tests/static/admin/fonts/Roboto-Regular-webfont.woff
+tests/static/admin/img/LICENSE
+tests/static/admin/img/README.txt
+tests/static/admin/img/calendar-icons.svg
+tests/static/admin/img/icon-addlink.svg
+tests/static/admin/img/icon-alert.svg
+tests/static/admin/img/icon-calendar.svg
+tests/static/admin/img/icon-changelink.svg
+tests/static/admin/img/icon-clock.svg
+tests/static/admin/img/icon-deletelink.svg
+tests/static/admin/img/icon-no.svg
+tests/static/admin/img/icon-unknown-alt.svg
+tests/static/admin/img/icon-unknown.svg
+tests/static/admin/img/icon-yes.svg
+tests/static/admin/img/inline-delete.svg
+tests/static/admin/img/search.svg
+tests/static/admin/img/selector-icons.svg
+tests/static/admin/img/sorting-icons.svg
+tests/static/admin/img/tooltag-add.svg
+tests/static/admin/img/tooltag-arrowright.svg
+tests/static/admin/img/gis/move_vertex_off.svg
+tests/static/admin/img/gis/move_vertex_on.svg
 tests/static/admin/js/SelectBox.js
 tests/static/admin/js/SelectFilter2.js
 tests/static/admin/js/actions.js
@@ -145,15 +139,17 @@ tests/static/admin/js/core.js
 tests/static/admin/js/inlines.js
 tests/static/admin/js/inlines.min.js
 tests/static/admin/js/jquery.init.js
-tests/static/admin/js/jquery.js
-tests/static/admin/js/jquery.min.js
 tests/static/admin/js/prepopulate.js
 tests/static/admin/js/prepopulate.min.js
-tests/static/admin/js/related-widget-wrapper.js
 tests/static/admin/js/timeparse.js
 tests/static/admin/js/urlify.js
 tests/static/admin/js/admin/DateTimeShortcuts.js
 tests/static/admin/js/admin/RelatedObjectLookups.js
+tests/static/admin/js/vendor/jquery/LICENSE-JQUERY.txt
+tests/static/admin/js/vendor/jquery/jquery.js
+tests/static/admin/js/vendor/jquery/jquery.min.js
+tests/static/admin/js/vendor/xregexp/LICENSE-XREGEXP.txt
+tests/static/admin/js/vendor/xregexp/xregexp.min.js
 tests/static/pipeline/css/first.css
 tests/static/pipeline/css/second.css
 tests/static/pipeline/css/unicode.css
@@ -179,6 +175,7 @@ tests/tests/__init__.py
 tests/tests/models.py
 tests/tests/test_compiler.py
 tests/tests/test_compressor.py
+tests/tests/test_conf.py
 tests/tests/test_glob.py
 tests/tests/test_middleware.py
 tests/tests/test_packager.py
diff --git a/django_pipeline.egg-info/pbr.json b/django_pipeline.egg-info/pbr.json
deleted file mode 100644
index 3d66085..0000000
--- a/django_pipeline.egg-info/pbr.json
+++ /dev/null
@@ -1 +0,0 @@
-{"is_release": false, "git_version": "c8c1b91"}
\ No newline at end of file
diff --git a/docs/compilers.rst b/docs/compilers.rst
index f56eabf..82f011c 100644
--- a/docs/compilers.rst
+++ b/docs/compilers.rst
@@ -11,13 +11,13 @@ Coffee Script compiler
 The Coffee Script compiler uses `Coffee Script <http://jashkenas.github.com/coffeescript/>`_
 to compile your javascript.
 
-To use it add this to your ``PIPELINE_COMPILERS`` ::
+To use it add this to your ``PIPELINE['COMPILERS']`` ::
 
-  PIPELINE_COMPILERS = (
+  PIPELINE['COMPILERS'] = (
     'pipeline.compilers.coffee.CoffeeScriptCompiler',
   )
 
-``PIPELINE_COFFEE_SCRIPT_BINARY``
+``COFFEE_SCRIPT_BINARY``
 ---------------------------------
 
   Command line to execute for coffee program.
@@ -25,7 +25,7 @@ To use it add this to your ``PIPELINE_COMPILERS`` ::
 
   Defaults to ``'/usr/bin/env coffee'``.
 
-``PIPELINE_COFFEE_SCRIPT_ARGUMENTS``
+``COFFEE_SCRIPT_ARGUMENTS``
 ------------------------------------
 
   Additional arguments to use when coffee is called.
@@ -38,13 +38,13 @@ Live Script compiler
 The LiveScript compiler uses `LiveScript <https://github.com/gkz/LiveScript>`_
 to compile your javascript.
 
-To use it add this to your ``PIPELINE_COMPILERS`` ::
+To use it add this to your ``PIPELINE['COMPILERS']`` ::
 
-  PIPELINE_COMPILERS = (
+  PIPELINE['COMPILERS'] = (
     'pipeline.compilers.livescript.LiveScriptCompiler',
   )
 
-``PIPELINE_LIVE_SCRIPT_BINARY``
+``LIVE_SCRIPT_BINARY``
 ---------------------------------
 
   Command line to execute for LiveScript program.
@@ -52,7 +52,7 @@ To use it add this to your ``PIPELINE_COMPILERS`` ::
 
   Defaults to ``'/usr/bin/env lsc'``.
 
-``PIPELINE_LIVE_SCRIPT_ARGUMENTS``
+``LIVE_SCRIPT_ARGUMENTS``
 ------------------------------------
 
   Additional arguments to use when lsc is called.
@@ -65,13 +65,13 @@ LESS compiler
 The LESS compiler uses `LESS <http://lesscss.org/>`_
 to compile your stylesheets.
 
-To use it add this to your ``PIPELINE_COMPILERS`` ::
+To use it add this to your ``PIPELINE['COMPILERS']`` ::
 
-  PIPELINE_COMPILERS = (
+  PIPELINE['COMPILERS'] = (
     'pipeline.compilers.less.LessCompiler',
   )
 
-``PIPELINE_LESS_BINARY``
+``LESS_BINARY``
 ------------------------
 
   Command line to execute for lessc program.
@@ -79,7 +79,7 @@ To use it add this to your ``PIPELINE_COMPILERS`` ::
 
   Defaults to ``'/usr/bin/env lessc'``.
 
-``PIPELINE_LESS_ARGUMENTS``
+``LESS_ARGUMENTS``
 ---------------------------
 
   Additional arguments to use when lessc is called.
@@ -92,14 +92,14 @@ SASS compiler
 The SASS compiler uses `SASS <http://sass-lang.com/>`_
 to compile your stylesheets.
 
-To use it add this to your ``PIPELINE_COMPILERS`` ::
+To use it add this to your ``PIPELINE['COMPILERS']`` ::
 
-  PIPELINE_COMPILERS = (
+  PIPELINE['COMPILERS'] = (
     'pipeline.compilers.sass.SASSCompiler',
   )
 
 
-``PIPELINE_SASS_BINARY``
+``SASS_BINARY``
 ------------------------
 
   Command line to execute for sass program.
@@ -107,7 +107,7 @@ To use it add this to your ``PIPELINE_COMPILERS`` ::
 
   Defaults to ``'/usr/bin/env sass'``.
 
-``PIPELINE_SASS_ARGUMENTS``
+``SASS_ARGUMENTS``
 ---------------------------
 
   Additional arguments to use when sass is called.
@@ -121,14 +121,14 @@ Stylus compiler
 The Stylus compiler uses `Stylus <http://learnboost.github.com/stylus/>`_
 to compile your stylesheets.
 
-To use it add this to your ``PIPELINE_COMPILERS`` ::
+To use it add this to your ``PIPELINE['COMPILERS']`` ::
 
-  PIPELINE_COMPILERS = (
+  PIPELINE['COMPILERS'] = (
       'pipeline.compilers.stylus.StylusCompiler',
   )
 
 
-``PIPELINE_STYLUS_BINARY``
+``STYLUS_BINARY``
 --------------------------
 
   Command line to execute for stylus program.
@@ -136,7 +136,7 @@ To use it add this to your ``PIPELINE_COMPILERS`` ::
 
   Defaults to ``'/usr/bin/env stylus'``.
 
-``PIPELINE_STYLUS_ARGUMENTS``
+``STYLUS_ARGUMENTS``
 -----------------------------
 
   Additional arguments to use when stylus is called.
@@ -150,14 +150,14 @@ ES6 compiler
 The ES6 compiler uses `Babel <https://babeljs.io>`_
 to convert ES6+ code into vanilla ES5.
 
-To use it add this to your ``PIPELINE_COMPILERS`` ::
+To use it add this to your ``PIPELINE['COMPILERS']`` ::
 
-  PIPELINE_COMPILERS = (
+  PIPELINE['COMPILERS'] = (
       'pipeline.compilers.es6.ES6Compiler',
   )
 
 
-``PIPELINE_BABEL_BINARY``
+``BABEL_BINARY``
 --------------------------
 
   Command line to execute for babel program.
@@ -165,7 +165,7 @@ To use it add this to your ``PIPELINE_COMPILERS`` ::
 
   Defaults to ``'/usr/bin/env babel'``.
 
-``PIPELINE_BABEL_ARGUMENTS``
+``BABEL_ARGUMENTS``
 -----------------------------
 
   Additional arguments to use when babel is called.
@@ -182,7 +182,7 @@ of compilers.
 To do so, you just have to create a class that inherits from ``pipeline.compilers.CompilerBase``
 and implements ``match_file`` and ``compile_file`` when needed.
 
-Finally, specify it in the tuple of compilers ``PIPELINE_COMPILERS`` in the settings.
+Finally, specify it in the tuple of compilers ``PIPELINE['COMPILERS']`` in the settings.
 
 Example
 -------
@@ -224,6 +224,6 @@ Compass (standalone)
 :Creator:
     `Vitaly Babiy <https://github.com/vbabiy>`_
 :Description:
-    django-pipeline-compass is a compiler for `django-pipeline <https://github.com/cyberdelia/django-pipeline>`_. Making it really easy to use scss and compass with out requiring the compass gem.
+    django-pipeline-compass is a compiler for `django-pipeline <https://github.com/jazzband/django-pipeline>`_. Making it really easy to use scss and compass with out requiring the compass gem.
 :Link:
     `https://github.com/vbabiy/django-pipeline-compass`
diff --git a/docs/compressors.rst b/docs/compressors.rst
index 1f7de1d..2524fc7 100644
--- a/docs/compressors.rst
+++ b/docs/compressors.rst
@@ -11,16 +11,16 @@ Yuglify compressor
 The Yuglify compressor uses `yuglify <http://github.com/yui/yuglify>`_
 for compressing javascript and stylesheets.
 
-To use it for your stylesheets add this to your ``PIPELINE_CSS_COMPRESSOR`` ::
+To use it for your stylesheets add this to your ``PIPELINE['CSS_COMPRESSOR']`` ::
 
-  PIPELINE_CSS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
+  PIPELINE['CSS_COMPRESSOR'] = 'pipeline.compressors.yuglify.YuglifyCompressor'
 
-To use it for your javascripts add this to your ``PIPELINE_JS_COMPRESSOR`` ::
+To use it for your javascripts add this to your ``PIPELINE['JS_COMPRESSOR']`` ::
 
-  PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
+  PIPELINE['JS_COMPRESSOR'] = 'pipeline.compressors.yuglify.YuglifyCompressor'
 
 
-``PIPELINE_YUGLIFY_BINARY``
+``YUGLIFY_BINARY``
 ---------------------------
 
   Command line to execute for the Yuglify program.
@@ -28,14 +28,14 @@ To use it for your javascripts add this to your ``PIPELINE_JS_COMPRESSOR`` ::
 
   Defaults to ``'/usr/bin/env yuglify'``.
 
-``PIPELINE_YUGLIFY_CSS_ARGUMENTS``
+``YUGLIFY_CSS_ARGUMENTS``
 ----------------------------------
 
   Additional arguments to use when compressing CSS.
 
   Defaults to ``'--terminal'``.
 
-``PIPELINE_YUGLIFY_JS_ARGUMENTS``
+``YUGLIFY_JS_ARGUMENTS``
 ---------------------------------
 
   Additional arguments to use when compressing JavaScript.
@@ -49,16 +49,16 @@ YUI Compressor compressor
 The YUI compressor uses `yui-compressor <http://developer.yahoo.com/yui/compressor/>`_
 for compressing javascript and stylesheets.
 
-To use it for your stylesheets add this to your ``PIPELINE_CSS_COMPRESSOR`` ::
+To use it for your stylesheets add this to your ``PIPELINE['CSS_COMPRESSOR']`` ::
 
-  PIPELINE_CSS_COMPRESSOR = 'pipeline.compressors.yui.YUICompressor'
+  PIPELINE['CSS_COMPRESSOR'] = 'pipeline.compressors.yui.YUICompressor'
 
-To use it for your javascripts add this to your ``PIPELINE_JS_COMPRESSOR`` ::
+To use it for your javascripts add this to your ``PIPELINE['JS_COMPRESSOR']`` ::
 
-  PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.yui.YUICompressor'
+  PIPELINE['JS_COMPRESSOR'] = 'pipeline.compressors.yui.YUICompressor'
 
 
-``PIPELINE_YUI_BINARY``
+``YUI_BINARY``
 -----------------------
 
   Command line to execute for the YUI program.
@@ -70,14 +70,14 @@ To use it for your javascripts add this to your ``PIPELINE_JS_COMPRESSOR`` ::
   Don't point to ``yuicompressor.jar`` directly, we expect to find a executable script.
 
 
-``PIPELINE_YUI_CSS_ARGUMENTS``
+``YUI_CSS_ARGUMENTS``
 ------------------------------
 
   Additional arguments to use when compressing CSS.
 
   Defaults to ``''``.
 
-``PIPELINE_YUI_JS_ARGUMENTS``
+``YUI_JS_ARGUMENTS``
 -----------------------------
 
   Additional arguments to use when compressing JavaScript.
@@ -91,12 +91,12 @@ Closure Compiler compressor
 The Closure compressor uses `Google Closure Compiler <http://code.google.com/closure/compiler/>`_
 to compress javascripts.
 
-To use it add this to your ``PIPELINE_JS_COMPRESSOR`` ::
+To use it add this to your ``PIPELINE['JS_COMPRESSOR']`` ::
 
-  PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.closure.ClosureCompressor'
+  PIPELINE['JS_COMPRESSOR'] = 'pipeline.compressors.closure.ClosureCompressor'
 
 
-``PIPELINE_CLOSURE_BINARY``
+``CLOSURE_BINARY``
 ---------------------------
 
   Command line to execute for the Closure Compiler program.
@@ -108,7 +108,7 @@ To use it add this to your ``PIPELINE_JS_COMPRESSOR`` ::
   Don't point to ``compiler.jar`` directly, we expect to find a executable script.
 
 
-``PIPELINE_CLOSURE_ARGUMENTS``
+``CLOSURE_ARGUMENTS``
 ------------------------------
 
   Additional arguments to use when closure is called.
@@ -122,12 +122,12 @@ UglifyJS compressor
 The UglifyJS compressor uses `UglifyJS <https://github.com/mishoo/UglifyJS2/>`_ to
 compress javascripts.
 
-To use it add this to your ``PIPELINE_JS_COMPRESSOR`` ::
+To use it add this to your ``PIPELINE['JS_COMPRESSOR']`` ::
 
-  PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.uglifyjs.UglifyJSCompressor'
+  PIPELINE['JS_COMPRESSOR'] = 'pipeline.compressors.uglifyjs.UglifyJSCompressor'
 
 
-``PIPELINE_UGLIFYJS_BINARY``
+``UGLIFYJS_BINARY``
 ----------------------------
 
   Command line to execute for the UglifyJS program.
@@ -135,7 +135,7 @@ To use it add this to your ``PIPELINE_JS_COMPRESSOR`` ::
 
   Defaults to ``'/usr/bin/env uglifyjs'``.
 
-``PIPELINE_UGLIFYJS_ARGUMENTS``
+``UGLIFYJS_ARGUMENTS``
 -------------------------------
 
   Additional arguments to use when uglifyjs is called.
@@ -149,9 +149,9 @@ JSMin compressor
 The jsmin compressor uses Douglas Crockford jsmin tool to
 compress javascripts.
 
-To use it add this to your ``PIPELINE_JS_COMPRESSOR`` ::
+To use it add this to your ``PIPELINE['JS_COMPRESSOR']`` ::
 
-  PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.jsmin.JSMinCompressor'
+  PIPELINE['JS_COMPRESSOR'] = 'pipeline.compressors.jsmin.JSMinCompressor'
 
 Install the jsmin library with your favorite Python package manager ::
 
@@ -164,9 +164,9 @@ SlimIt compressor
 The slimit compressor uses `SlimIt <http://slimit.org/>`_ to
 compress javascripts.
 
-To use it add this to your ``PIPELINE_JS_COMPRESSOR`` ::
+To use it add this to your ``PIPELINE['JS_COMPRESSOR']`` ::
 
-  PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.slimit.SlimItCompressor'
+  PIPELINE['JS_COMPRESSOR'] = 'pipeline.compressors.slimit.SlimItCompressor'
 
 Install the slimit library with your favorite Python package manager ::
 
@@ -179,11 +179,11 @@ CSSTidy compressor
 The CSStidy compressor uses `CSStidy <http://csstidy.sourceforge.net/>`_ to compress
 stylesheets.
 
-To us it for your stylesheets add this to your ``PIPELINE_CSS_COMPRESSOR`` ::
+To us it for your stylesheets add this to your ``PIPELINE['CSS_COMPRESSOR']`` ::
 
-  PIPELINE_CSS_COMPRESSOR = 'pipeline.compressors.csstidy.CSSTidyCompressor'
+  PIPELINE['CSS_COMPRESSOR'] = 'pipeline.compressors.csstidy.CSSTidyCompressor'
 
-``PIPELINE_CSSTIDY_BINARY``
+``CSSTIDY_BINARY``
 ---------------------------
 
   Command line to execute for csstidy program.
@@ -191,7 +191,7 @@ To us it for your stylesheets add this to your ``PIPELINE_CSS_COMPRESSOR`` ::
 
   Defaults to ``'/usr/bin/env csstidy'``
 
-``PIPELINE_CSSTIDY_ARGUMENTS``
+``CSSTIDY_ARGUMENTS``
 ------------------------------
 
   Additional arguments to use when csstidy is called.
@@ -202,11 +202,11 @@ CSSMin compressor
 =================
 
 The cssmin compressor uses the `cssmin <https://github.com/jbleuzen/node-cssmin>`_
-command to compress stylesheets. To use it, add this to your ``PIPELINE_CSS_COMPRESSOR`` ::
+command to compress stylesheets. To use it, add this to your ``PIPELINE['CSS_COMPRESSOR']`` ::
 
-  PIPELINE_CSS_COMPRESSOR = 'pipeline.compressors.cssmin.CSSMinCompressor'
+  PIPELINE['CSS_COMPRESSOR'] = 'pipeline.compressors.cssmin.CSSMinCompressor'
 
-``PIPELINE_CSSMIN_BINARY``
+``CSSMIN_BINARY``
 ---------------------------
 
   Command line to execute for cssmin program.
@@ -214,7 +214,7 @@ command to compress stylesheets. To use it, add this to your ``PIPELINE_CSS_COMP
 
   Defaults to ``'/usr/bin/env cssmin'``
 
-``PIPELINE_CSSMIN_ARGUMENTS``
+``CSSMIN_ARGUMENTS``
 ------------------------------
 
   Additional arguments to use when cssmin is called.
@@ -229,8 +229,8 @@ This is useful for debugging faulty concatenation due to poorly written javascri
 
 To use it, add this to your settings ::
 
-  PIPELINE_CSS_COMPRESSOR = 'pipeline.compressors.NoopCompressor'
-  PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.NoopCompressor'
+  PIPELINE['CSS_COMPRESSOR'] = 'pipeline.compressors.NoopCompressor'
+  PIPELINE['JS_COMPRESSOR'] = 'pipeline.compressors.NoopCompressor'
 
 
 Write your own compressor class
@@ -242,8 +242,8 @@ of compressors.
 To do so, you just have to create a class that inherits from ``pipeline.compressors.CompressorBase``
 and implements ``compress_css`` and/or a ``compress_js`` when needed.
 
-Finally, add it to ``PIPELINE_CSS_COMPRESSOR`` or
-``PIPELINE_JS_COMPRESSOR`` settings (see :doc:`configuration` for more information).
+Finally, add it to ``PIPELINE['CSS_COMPRESSOR']`` or
+``PIPELINE['JS_COMPRESSOR']`` settings (see :doc:`configuration` for more information).
 
 Example
 -------
@@ -262,5 +262,5 @@ A custom compressor for an imaginary compressor called jam ::
 
 Add it to your settings ::
 
-  PIPELINE_CSS_COMPRESSOR = 'jam.compressors.JamCompressor'
-  PIPELINE_JS_COMPRESSOR = 'jam.compressors.JamCompressor'
+  PIPELINE['CSS_COMPRESSOR'] = 'jam.compressors.JamCompressor'
+  PIPELINE['JS_COMPRESSOR'] = 'jam.compressors.JamCompressor'
diff --git a/docs/conf.py b/docs/conf.py
index f770e12..e515830 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -49,9 +49,9 @@ copyright = u'2011-2014, Timothée Peignier'
 # built documents.
 #
 # The short X.Y version.
-version = '1.5'
+version = '1.6'
 # The full version, including alpha/beta/rc tags.
-release = '1.5.4'
+release = '1.6.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/configuration.rst b/docs/configuration.rst
index 9b7926d..ff282b1 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -5,7 +5,22 @@ Configuration
 =============
 
 
-Configuration and list of available settings for Pipeline
+Configuration and list of available settings for Pipeline. Pipeline settings are namespaced in a PIPELINE dictionary in your project settings, e.g.: ::
+
+  PIPELINE = {
+      'PIPELINE_ENABLED': True,
+      'JAVASCRIPT': {
+          'stats': {
+              'source_filenames': (
+                'js/jquery.js',
+                'js/d3.js',
+                'js/collections/*.js',
+                'js/application.js',
+              ),
+              'output_filename': 'js/stats.js',
+          }
+      }
+  }
 
 
 Specifying files
@@ -16,29 +31,30 @@ syntax to select multiples files.
 
 The basic syntax for specifying CSS/JavaScript groups files is ::
 
-  PIPELINE_CSS = {
-      'colors': {
-          'source_filenames': (
-            'css/core.css',
-            'css/colors/*.css',
-            'css/layers.css'
-          ),
-          'output_filename': 'css/colors.css',
-          'extra_context': {
-              'media': 'screen,projection',
+  PIPELINE = {
+      'STYLESHEETS': {
+          'colors': {
+              'source_filenames': (
+                'css/core.css',
+                'css/colors/*.css',
+                'css/layers.css'
+              ),
+              'output_filename': 'css/colors.css',
+              'extra_context': {
+                  'media': 'screen,projection',
+              },
           },
       },
... 15511 lines suppressed ...

-- 
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