[Python-modules-commits] [django-pipeline] 01/06: Import django-pipeline_1.6.7.orig.tar.gz
Brian May
bam at moszumanska.debian.org
Wed Mar 23 00:29:08 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 5df2e5effab5025dcdd8f9b53e05f7c4c3eff9d8
Author: Brian May <bam at debian.org>
Date: Wed Mar 23 11:21:36 2016 +1100
Import django-pipeline_1.6.7.orig.tar.gz
---
AUTHORS | 3 +
HISTORY.rst | 32 +
MANIFEST.in | 3 +
PKG-INFO | 43 +-
README.rst | 9 +
django_pipeline.egg-info/PKG-INFO | 43 +-
django_pipeline.egg-info/SOURCES.txt | 111 +-
django_pipeline.egg-info/requires.txt | 1 -
docs/compilers.rst | 4 +-
docs/compressors.rst | 2 +-
docs/conf.py | 2 +-
docs/configuration.rst | 41 +-
pipeline/collector.py | 12 +-
pipeline/compilers/__init__.py | 38 +-
pipeline/compressors/__init__.py | 3 +-
pipeline/conf.py | 13 +-
pipeline/exceptions.py | 6 +-
pipeline/glob.py | 7 +-
pipeline/jinja2/__init__.py | 4 +-
pipeline/templates/pipeline/compile_error.html | 31 +
pipeline/templatetags/pipeline.py | 42 +-
pipeline/utils.py | 24 +
pipeline/views.py | 38 +
setup.py | 2 +-
tests/assets/compilers/coffee/expected.js | 12 +
.../compilers/coffee/input.coffee} | 0
tests/assets/compilers/es6/expected.js | 27 +
tests/assets/compilers/es6/input.es6 | 19 +
tests/assets/compilers/less/expected.css | 3 +
tests/assets/compilers/less/input.less | 5 +
tests/assets/compilers/livescript/expected.js | 6 +
tests/assets/compilers/livescript/input.ls | 2 +
tests/assets/compilers/scss/expected.css | 5 +
tests/assets/compilers/scss/input.scss | 10 +
tests/assets/compilers/stylus/expected.css | 3 +
tests/assets/compilers/stylus/input.styl | 2 +
tests/assets/compressors/closure.js | 1 +
tests/assets/compressors/cssmin.css | 1 +
tests/assets/compressors/csstidy.css | 1 +
tests/assets/compressors/jsmin.js | 1 +
tests/assets/compressors/slimit.js | 1 +
tests/assets/compressors/uglifyjs.js | 1 +
tests/assets/compressors/yuglify.css | 1 +
tests/assets/compressors/yuglify.js | 1 +
tests/assets/compressors/yui.css | 1 +
tests/assets/compressors/yui.js | 1 +
tests/package.json | 27 +
tests/scripts/npm_install.py | 42 +
tests/settings.py | 46 +
tests/static/admin/css/base.css | 967 --
tests/static/admin/css/changelists.css | 341 -
tests/static/admin/css/dashboard.css | 30 -
tests/static/admin/css/fonts.css | 20 -
tests/static/admin/css/forms.css | 499 --
tests/static/admin/css/login.css | 78 -
tests/static/admin/css/rtl.css | 256 -
tests/static/admin/css/widgets.css | 565 --
tests/static/admin/fonts/LICENSE.txt | 202 -
tests/static/admin/fonts/README.txt | 2 -
tests/static/admin/fonts/Roboto-Bold-webfont.woff | Bin 82564 -> 0 bytes
tests/static/admin/fonts/Roboto-Light-webfont.woff | Bin 81348 -> 0 bytes
.../static/admin/fonts/Roboto-Regular-webfont.woff | Bin 80304 -> 0 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/gis/move_vertex_off.svg | 1 -
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.svg | 3 -
tests/static/admin/img/icon-unknown-alt.svg | 3 -
tests/static/admin/img/icon-unknown.svg | 3 -
tests/static/admin/img/icon-yes.svg | 3 -
tests/static/admin/img/inline-delete.svg | 3 -
tests/static/admin/img/search.svg | 3 -
tests/static/admin/img/selector-icons.svg | 34 -
tests/static/admin/img/sorting-icons.svg | 19 -
tests/static/admin/img/tooltag-add.svg | 3 -
tests/static/admin/img/tooltag-arrowright.svg | 3 -
tests/static/admin/js/SelectBox.js | 135 -
tests/static/admin/js/SelectFilter2.js | 198 -
tests/static/admin/js/actions.js | 146 -
tests/static/admin/js/actions.min.js | 6 -
tests/static/admin/js/admin/DateTimeShortcuts.js | 364 -
.../static/admin/js/admin/RelatedObjectLookups.js | 181 -
tests/static/admin/js/calendar.js | 178 -
tests/static/admin/js/collapse.js | 26 -
tests/static/admin/js/collapse.min.js | 2 -
tests/static/admin/js/core.js | 263 -
tests/static/admin/js/inlines.js | 275 -
tests/static/admin/js/inlines.min.js | 9 -
tests/static/admin/js/jquery.init.js | 8 -
tests/static/admin/js/prepopulate.js | 42 -
tests/static/admin/js/prepopulate.min.js | 1 -
tests/static/admin/js/timeparse.js | 106 -
tests/static/admin/js/urlify.js | 171 -
.../admin/js/vendor/jquery/LICENSE-JQUERY.txt | 26 -
tests/static/admin/js/vendor/jquery/jquery.js | 9210 --------------------
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/pipeline/css/first.css | 3 -
tests/static/pipeline/css/nested/nested.css | 6 -
tests/static/pipeline/css/second.css | 3 -
tests/static/pipeline/css/unicode.css | 4 -
tests/static/pipeline/css/urls.css | 27 -
tests/static/pipeline/fonts/pipeline.eot | 0
tests/static/pipeline/fonts/pipeline.svg | 0
tests/static/pipeline/fonts/pipeline.ttf | 0
tests/static/pipeline/fonts/pipeline.woff | 0
tests/static/pipeline/images/arrow.png | Bin 107 -> 0 bytes
tests/static/pipeline/images/embed/arrow.png | Bin 107 -> 0 bytes
tests/static/pipeline/images/sprite-buttons.png | 0
tests/static/pipeline/js/application.js | 3 -
tests/static/pipeline/js/first.js | 5 -
tests/static/pipeline/js/second.js | 5 -
tests/static/pipeline/templates/photo/detail.jst | 6 -
tests/static/pipeline/templates/photo/list.jst | 6 -
tests/static/pipeline/templates/video/detail.jst | 6 -
tests/static/screen.css | 0
tests/static/scripts.js | 3 -
tests/static/scripts_async.js | 3 -
tests/static/scripts_async_defer.js | 3 -
tests/static/scripts_defer.js | 3 -
tests/tests/__init__.py | 10 +
tests/tests/test_collector.py | 41 +
tests/tests/test_compiler.py | 90 +-
tests/tests/test_compressor.py | 93 +-
tests/tests/test_conf.py | 9 +
tests/tests/test_glob.py | 1 -
tests/tests/test_storage.py | 13 +-
tests/tests/test_views.py | 93 +
tests/utils.py | 57 +-
137 files changed, 993 insertions(+), 14733 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 41a758b..5a2228f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -40,6 +40,7 @@ or just made Pipeline more awesome.
* David Charbonnier <d.charbonnier at oxys.net>
* David Cramer <dcramer at gmail.com>
* David Hughes <d at vidhughes.com>
+ * David Trowbridge <trowbrds at gmail.com>
* Denis V Seleznyov <code at xy2.ru>
* DJ Sharkey <dj at newscred.com>
* Edwin Lunando <edwinlunando at gmail.com>
@@ -48,6 +49,7 @@ or just made Pipeline more awesome.
* Fabian Büchler <fabian.buechler at gmail.com>
* Feanil Patel <feanil at edx.org>
* Florent Messa <florent.messa at gmail.com>
+ * Frankie Dintino <fdintino at theatlantic.com>
* Hannes Ljungberg <hannes.ljungberg at gmail.com>
* Idan Zalzberg <idanzalz at gmail.com>
* Jacob Haslehurst <jacob at haslehurst.net>
@@ -74,6 +76,7 @@ or just made Pipeline more awesome.
* Mike Gilbert <floppym at gentoo.org>
* Miroslav Shubernetskiy <miroslav at miki725.com>
* Natal Ngetal <natal.ngetal at novapost.fr>
+ * Nathan Cox <akujin at akujin.com>
* Nathan Shafer <nate at torzo.com>
* Patrick Altman <paltman at gmail.com>
* Peter Baumgartner <pete at lincolnloop.com>
diff --git a/HISTORY.rst b/HISTORY.rst
index 775aa1b..3e00b82 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,38 @@
History
=======
+1.6.7
+=====
+
+* Add a view for collecting static files before serving them. This behaves like
+ django's built-in ``static`` view and allows running the collector for
+ images, fonts, and other static files that do not need to be compiled. Thanks
+ to Christian Hammond.
+* Update documentation for the ES6Compiler to clarify filename requirements.
+ Thanks to Nathan Cox.
+* Add error output for compiler errors within the browser. This provides for a
+ much better experience when compiling files from the devserver. Thanks to
+ Christian Hammond.
+* Make unit tests run against Django 1.6 and 1.7. Thanks to Sławek Ehlert.
+
+1.6.6
+=====
+
+* Fix filtering-out of files which require a finder to locate.
+* Allow compilers to override the output path.
+* Fix error reporting when a compiler fails to execute.
+* Fix IOErrors when running collectstatic with some nodejs-based compilers and
+ compressors. Thanks to Frankie Dintino.
+* Fix compatibility of unit tests when running on Windows. Thanks to Frankie
+ Dintino.
+* Add unit tests for compilers and compressors. Thanks to Frankie Dintino.
+
+1.6.5
+=====
+
+* Fix Django < 1.8 compatibility. Thanks to David Trowbridge.
+* Allow to disable collector during development. Thanks to Leonardo Orozco.
+
1.6.4
=====
diff --git a/MANIFEST.in b/MANIFEST.in
index b5128c7..c91427a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,5 +3,8 @@ recursive-include pipeline/jinja2 *.html *.jinja
include AUTHORS LICENSE README.rst HISTORY.rst
recursive-include tests *
recursive-exclude tests *.pyc *.pyo
+recursive-exclude tests/node_modules *
+recursive-exclude tests/npm-cache *
+recursive-exclude tests/npm *
include docs/Makefile docs/make.bat docs/conf.py
recursive-include docs *.rst
diff --git a/PKG-INFO b/PKG-INFO
index c9173ca..ec6ba3c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: django-pipeline
-Version: 1.6.4
+Version: 1.6.7
Summary: Pipeline is an asset packaging library for Django.
Home-page: https://github.com/jazzband/django-pipeline
Author: Timothée Peignier
@@ -9,10 +9,19 @@ License: MIT
Description: Pipeline
========
+ .. image:: https://secure.travis-ci.org/jazzband/django-pipeline.png
+ :alt: Build Status
+ :target: http://travis-ci.org/jazzband/django-pipeline
+
+ .. image:: https://jazzband.co/static/img/badge.svg
+ :alt: Jazzband
+ :target: https://jazzband.co/
+
Pipeline is an asset packaging library for Django, providing both CSS and
JavaScript concatenation and compression, built-in JavaScript template support,
and optional data-URI image and font embedding.
+
Installation
------------
@@ -33,6 +42,38 @@ Description: Pipeline
History
=======
+ 1.6.7
+ =====
+
+ * Add a view for collecting static files before serving them. This behaves like
+ django's built-in ``static`` view and allows running the collector for
+ images, fonts, and other static files that do not need to be compiled. Thanks
+ to Christian Hammond.
+ * Update documentation for the ES6Compiler to clarify filename requirements.
+ Thanks to Nathan Cox.
+ * Add error output for compiler errors within the browser. This provides for a
+ much better experience when compiling files from the devserver. Thanks to
+ Christian Hammond.
+ * Make unit tests run against Django 1.6 and 1.7. Thanks to Sławek Ehlert.
+
+ 1.6.6
+ =====
+
+ * Fix filtering-out of files which require a finder to locate.
+ * Allow compilers to override the output path.
+ * Fix error reporting when a compiler fails to execute.
+ * Fix IOErrors when running collectstatic with some nodejs-based compilers and
+ compressors. Thanks to Frankie Dintino.
+ * Fix compatibility of unit tests when running on Windows. Thanks to Frankie
+ Dintino.
+ * Add unit tests for compilers and compressors. Thanks to Frankie Dintino.
+
+ 1.6.5
+ =====
+
+ * Fix Django < 1.8 compatibility. Thanks to David Trowbridge.
+ * Allow to disable collector during development. Thanks to Leonardo Orozco.
+
1.6.4
=====
diff --git a/README.rst b/README.rst
index 208cea5..ed0b2ed 100644
--- a/README.rst
+++ b/README.rst
@@ -1,10 +1,19 @@
Pipeline
========
+.. image:: https://secure.travis-ci.org/jazzband/django-pipeline.png
+ :alt: Build Status
+ :target: http://travis-ci.org/jazzband/django-pipeline
+
+.. image:: https://jazzband.co/static/img/badge.svg
+ :alt: Jazzband
+ :target: https://jazzband.co/
+
Pipeline is an asset packaging library for Django, providing both CSS and
JavaScript concatenation and compression, built-in JavaScript template support,
and optional data-URI image and font embedding.
+
Installation
------------
diff --git a/django_pipeline.egg-info/PKG-INFO b/django_pipeline.egg-info/PKG-INFO
index c9173ca..ec6ba3c 100644
--- a/django_pipeline.egg-info/PKG-INFO
+++ b/django_pipeline.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: django-pipeline
-Version: 1.6.4
+Version: 1.6.7
Summary: Pipeline is an asset packaging library for Django.
Home-page: https://github.com/jazzband/django-pipeline
Author: Timothée Peignier
@@ -9,10 +9,19 @@ License: MIT
Description: Pipeline
========
+ .. image:: https://secure.travis-ci.org/jazzband/django-pipeline.png
+ :alt: Build Status
+ :target: http://travis-ci.org/jazzband/django-pipeline
+
+ .. image:: https://jazzband.co/static/img/badge.svg
+ :alt: Jazzband
+ :target: https://jazzband.co/
+
Pipeline is an asset packaging library for Django, providing both CSS and
JavaScript concatenation and compression, built-in JavaScript template support,
and optional data-URI image and font embedding.
+
Installation
------------
@@ -33,6 +42,38 @@ Description: Pipeline
History
=======
+ 1.6.7
+ =====
+
+ * Add a view for collecting static files before serving them. This behaves like
+ django's built-in ``static`` view and allows running the collector for
+ images, fonts, and other static files that do not need to be compiled. Thanks
+ to Christian Hammond.
+ * Update documentation for the ES6Compiler to clarify filename requirements.
+ Thanks to Nathan Cox.
+ * Add error output for compiler errors within the browser. This provides for a
+ much better experience when compiling files from the devserver. Thanks to
+ Christian Hammond.
+ * Make unit tests run against Django 1.6 and 1.7. Thanks to Sławek Ehlert.
+
+ 1.6.6
+ =====
+
+ * Fix filtering-out of files which require a finder to locate.
+ * Allow compilers to override the output path.
+ * Fix error reporting when a compiler fails to execute.
+ * Fix IOErrors when running collectstatic with some nodejs-based compilers and
+ compressors. Thanks to Frankie Dintino.
+ * Fix compatibility of unit tests when running on Windows. Thanks to Frankie
+ Dintino.
+ * Add unit tests for compilers and compressors. Thanks to Frankie Dintino.
+
+ 1.6.5
+ =====
+
+ * Fix Django < 1.8 compatibility. Thanks to David Trowbridge.
+ * Allow to disable collector during development. Thanks to Leonardo Orozco.
+
1.6.4
=====
diff --git a/django_pipeline.egg-info/SOURCES.txt b/django_pipeline.egg-info/SOURCES.txt
index 9684605..9b4ee17 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/requires.txt
django_pipeline.egg-info/top_level.txt
docs/Makefile
docs/compilers.rst
@@ -36,6 +35,7 @@ pipeline/packager.py
pipeline/signals.py
pipeline/storage.py
pipeline/utils.py
+pipeline/views.py
pipeline/compilers/__init__.py
pipeline/compilers/coffee.py
pipeline/compilers/es6.py
@@ -56,6 +56,7 @@ pipeline/jinja2/__init__.py
pipeline/jinja2/pipeline/css.jinja
pipeline/jinja2/pipeline/inline_js.jinja
pipeline/jinja2/pipeline/js.jinja
+pipeline/templates/pipeline/compile_error.html
pipeline/templates/pipeline/css.html
pipeline/templates/pipeline/css.jinja
pipeline/templates/pipeline/inline_js.html
@@ -66,10 +67,33 @@ pipeline/templatetags/__init__.py
pipeline/templatetags/pipeline.py
tests/__init__.py
tests/models.py
+tests/package.json
tests/settings.py
tests/urls.py
tests/utils.py
tests/views.py
+tests/assets/compilers/coffee/expected.js
+tests/assets/compilers/coffee/input.coffee
+tests/assets/compilers/es6/expected.js
+tests/assets/compilers/es6/input.es6
+tests/assets/compilers/less/expected.css
+tests/assets/compilers/less/input.less
+tests/assets/compilers/livescript/expected.js
+tests/assets/compilers/livescript/input.ls
+tests/assets/compilers/scss/expected.css
+tests/assets/compilers/scss/input.scss
+tests/assets/compilers/stylus/expected.css
+tests/assets/compilers/stylus/input.styl
+tests/assets/compressors/closure.js
+tests/assets/compressors/cssmin.css
+tests/assets/compressors/csstidy.css
+tests/assets/compressors/jsmin.js
+tests/assets/compressors/slimit.js
+tests/assets/compressors/uglifyjs.js
+tests/assets/compressors/yuglify.css
+tests/assets/compressors/yuglify.js
+tests/assets/compressors/yui.css
+tests/assets/compressors/yui.js
tests/assets/css/first.css
tests/assets/css/second.css
tests/assets/css/unicode.css
@@ -89,90 +113,12 @@ tests/assets/js/second.js
tests/assets/templates/photo/detail.jst
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/login.css
-tests/static/admin/css/rtl.css
-tests/static/admin/css/widgets.css
-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
-tests/static/admin/js/actions.min.js
-tests/static/admin/js/calendar.js
-tests/static/admin/js/collapse.js
-tests/static/admin/js/collapse.min.js
-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/prepopulate.js
-tests/static/admin/js/prepopulate.min.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
-tests/static/pipeline/css/urls.css
-tests/static/pipeline/css/nested/nested.css
-tests/static/pipeline/fonts/pipeline.eot
-tests/static/pipeline/fonts/pipeline.svg
-tests/static/pipeline/fonts/pipeline.ttf
-tests/static/pipeline/fonts/pipeline.woff
-tests/static/pipeline/images/arrow.png
-tests/static/pipeline/images/sprite-buttons.png
-tests/static/pipeline/images/embed/arrow.png
-tests/static/pipeline/js/application.js
-tests/static/pipeline/js/dummy.coffee
-tests/static/pipeline/js/first.js
-tests/static/pipeline/js/second.js
-tests/static/pipeline/templates/photo/detail.jst
-tests/static/pipeline/templates/photo/list.jst
-tests/static/pipeline/templates/video/detail.jst
+tests/scripts/npm_install.py
tests/templates/empty.html
tests/templates/index.html
tests/tests/__init__.py
tests/tests/models.py
+tests/tests/test_collector.py
tests/tests/test_compiler.py
tests/tests/test_compressor.py
tests/tests/test_conf.py
@@ -181,4 +127,5 @@ tests/tests/test_middleware.py
tests/tests/test_packager.py
tests/tests/test_storage.py
tests/tests/test_template.py
-tests/tests/test_utils.py
\ No newline at end of file
+tests/tests/test_utils.py
+tests/tests/test_views.py
\ No newline at end of file
diff --git a/django_pipeline.egg-info/requires.txt b/django_pipeline.egg-info/requires.txt
deleted file mode 100644
index f3a90e9..0000000
--- a/django_pipeline.egg-info/requires.txt
+++ /dev/null
@@ -1 +0,0 @@
-futures>=2.1.3
diff --git a/docs/compilers.rst b/docs/compilers.rst
index 82f011c..f5a4b20 100644
--- a/docs/compilers.rst
+++ b/docs/compilers.rst
@@ -150,12 +150,14 @@ ES6 compiler
The ES6 compiler uses `Babel <https://babeljs.io>`_
to convert ES6+ code into vanilla ES5.
+Note that for files to be transpiled properly they must have the file extension **.es6**
+
To use it add this to your ``PIPELINE['COMPILERS']`` ::
PIPELINE['COMPILERS'] = (
'pipeline.compilers.es6.ES6Compiler',
)
-
+
``BABEL_BINARY``
--------------------------
diff --git a/docs/compressors.rst b/docs/compressors.rst
index 2524fc7..31481df 100644
--- a/docs/compressors.rst
+++ b/docs/compressors.rst
@@ -161,7 +161,7 @@ Install the jsmin library with your favorite Python package manager ::
SlimIt compressor
=================
-The slimit compressor uses `SlimIt <http://slimit.org/>`_ to
+The slimit compressor uses `SlimIt <http://slimit.readthedocs.org>`_ to
compress javascripts.
To use it add this to your ``PIPELINE['JS_COMPRESSOR']`` ::
diff --git a/docs/conf.py b/docs/conf.py
index e515830..ac7ed1e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,7 +51,7 @@ copyright = u'2011-2014, Timothée Peignier'
# The short X.Y version.
version = '1.6'
# The full version, including alpha/beta/rc tags.
-release = '1.6.4'
+release = '1.6.7'
# 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 ff282b1..65dec21 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -134,8 +134,31 @@ Other settings
Defaults to ``not settings.DEBUG``.
+``PIPELINE_COLLECTOR_ENABLED``
+..............................
+
+``True`` if assets should be collected in develop , ``False`` if not.
+
+Defaults to ``True``
+
+.. note::
+
+ this only work when PIPELINE_ENABLED is False.
+
+``SHOW_ERRORS_INLINE``
+......................
+
+``True`` if errors compiling CSS/JavaScript files should be shown inline at
+the top of the browser window, or ``False`` if they should trigger exceptions
+(the older behavior).
+
+This only applies when compiling through the ``{% stylesheet %}`` or
+``{% javascript %}`` template tags. It won't impact ``collectstatic``.
+
+Defaults to ``settings.DEBUG``.
+
``CSS_COMPRESSOR``
-............................
+..................
Compressor class to be applied to CSS files.
@@ -144,7 +167,7 @@ If empty or ``None``, CSS files won't be compressed.
Defaults to ``'pipeline.compressors.yuglify.YuglifyCompressor'``.
``JS_COMPRESSOR``
-...........................
+.................
Compressor class to be applied to JavaScript files.
@@ -157,7 +180,7 @@ Defaults to ``'pipeline.compressors.yuglify.YuglifyCompressor'``
Please note that in order to use Yuglify compressor, you need to install Yuglify (see :doc:`installation` for more details).
``TEMPLATE_NAMESPACE``
-...............................
+......................
Object name where all of your compiled templates will be added, from within your browser.
To access them with your own JavaScript namespace, change it to the object of your choice.
@@ -166,7 +189,7 @@ Defaults to ``"window.JST"``
``TEMPLATE_EXT``
-.........................
+................
The extension for which Pipeline will consider the file as a Javascript template.
To use a different extension, like ``.mustache``, set this settings to ``.mustache``.
@@ -174,7 +197,7 @@ To use a different extension, like ``.mustache``, set this settings to ``.mustac
Defaults to ``".jst"``
``TEMPLATE_FUNC``
-..........................
+.................
JavaScript function that compiles your JavaScript templates.
Pipeline doesn't bundle a javascript template library, but the default
@@ -184,7 +207,7 @@ setting is to use the
Defaults to ``"_.template"``
``TEMPLATE_SEPARATOR``
-...............................
+......................
Character chain used by Pipeline as replacement for directory separator.
@@ -192,7 +215,7 @@ Defaults to ``"_"``
``MIMETYPES``
-......................
+.............
Tuple that match file extension with their corresponding mimetypes.
@@ -242,7 +265,7 @@ Overriding embedding settings
You can override these rules using the following settings:
``EMBED_MAX_IMAGE_SIZE``
-.................................
+........................
Setting that controls the maximum image size (in bytes) to embed in CSS using Data-URIs.
Internet Explorer 8 has issues with assets over 32 kilobytes.
@@ -250,7 +273,7 @@ Internet Explorer 8 has issues with assets over 32 kilobytes.
Defaults to ``32700``
``EMBED_PATH``
-.......................
+..............
Setting the directory that an asset needs to be in so that it is embedded
diff --git a/pipeline/collector.py b/pipeline/collector.py
index 687273b..4d173c5 100644
--- a/pipeline/collector.py
+++ b/pipeline/collector.py
@@ -6,6 +6,7 @@ from collections import OrderedDict
from django.contrib.staticfiles import finders
from django.contrib.staticfiles.storage import staticfiles_storage
+from django.utils import six
from pipeline.finders import PipelineFinder
@@ -26,7 +27,7 @@ class Collector(object):
for d in dirs:
self.clear(os.path.join(path, d))
- def collect(self, request=None):
+ def collect(self, request=None, files=[]):
if self.request and self.request is request:
return
self.request = request
@@ -41,10 +42,17 @@ class Collector(object):
prefixed_path = os.path.join(storage.prefix, path)
else:
prefixed_path = path
- if prefixed_path not in found_files:
+
+ if (prefixed_path not in found_files and
+ (not files or prefixed_path in files)):
found_files[prefixed_path] = (storage, path)
self.copy_file(path, prefixed_path, storage)
+ if files and len(files) == len(found_files):
+ break
+
+ return six.iterkeys(found_files)
+
def copy_file(self, path, prefixed_path, source_storage):
# Delete the target file if needed or break
if not self.delete_file(path, prefixed_path, source_storage):
diff --git a/pipeline/compilers/__init__.py b/pipeline/compilers/__init__.py
index 4610c09..a7a512d 100644
--- a/pipeline/compilers/__init__.py
+++ b/pipeline/compilers/__init__.py
@@ -8,11 +8,11 @@ from django.contrib.staticfiles import finders
from django.contrib.staticfiles.storage import staticfiles_storage
from django.core.files.base import ContentFile
from django.utils.encoding import smart_bytes
-from django.utils.six import string_types
+from django.utils.six import string_types, text_type
from pipeline.conf import settings
from pipeline.exceptions import CompilerError
-from pipeline.utils import to_class
+from pipeline.utils import to_class, set_std_streams_blocking
class Compiler(object):
@@ -31,16 +31,16 @@ class Compiler(object):
for compiler in self.compilers:
compiler = compiler(verbose=self.verbose, storage=self.storage)
if compiler.match_file(input_path):
- output_path = self.output_path(input_path, compiler.output_extension)
try:
infile = self.storage.path(input_path)
except NotImplementedError:
infile = finders.find(input_path)
- outfile = self.output_path(infile, compiler.output_extension)
- outdated = compiler.is_outdated(input_path, output_path)
+ outfile = compiler.output_path(infile, compiler.output_extension)
+ outdated = compiler.is_outdated(infile, outfile)
compiler.compile_file(infile, outfile,
outdated=outdated, force=force)
- return output_path
+
+ return compiler.output_path(input_path, compiler.output_extension)
else:
return input_path
@@ -53,10 +53,6 @@ class Compiler(object):
with futures.ThreadPoolExecutor(max_workers=multiprocessing.cpu_count()) as executor:
return list(executor.map(_compile, paths))
- def output_path(self, path, extension):
- path = os.path.splitext(path)
- return '.'.join((path[0], extension))
-
class CompilerBase(object):
def __init__(self, verbose, storage):
@@ -78,6 +74,10 @@ class CompilerBase(object):
file.close()
return content
+ def output_path(self, path, extension):
+ path = os.path.splitext(path)
+ return '.'.join((path[0], extension))
+
def is_outdated(self, infile, outfile):
if not self.storage.exists(outfile):
return True
@@ -111,6 +111,7 @@ class SubProcessCompiler(CompilerBase):
else:
argument_list.extend(flattening_arg)
+ stdout = None
try:
# We always catch stdout in a file, but we may not have a use for it.
temp_file_container = cwd or os.path.dirname(stdout_captured or "") or os.getcwd()
@@ -119,11 +120,14 @@ class SubProcessCompiler(CompilerBase):
stdout=stdout,
stderr=subprocess.PIPE)
_, stderr = compiling.communicate()
+ set_std_streams_blocking()
if compiling.returncode != 0:
stdout_captured = None # Don't save erroneous result.
raise CompilerError(
- "{0!r} exit code {1}\n{2}".format(argument_list, compiling.returncode, stderr))
+ "{0!r} exit code {1}\n{2}".format(argument_list, compiling.returncode, stderr),
+ command=argument_list,
+ error_output=stderr)
# User wants to see everything that happened.
if self.verbose:
@@ -132,10 +136,12 @@ class SubProcessCompiler(CompilerBase):
print(stderr)
except OSError as e:
stdout_captured = None # Don't save erroneous result.
- raise CompilerError(e)
+ raise CompilerError(e, command=argument_list,
+ error_output=text_type(e))
finally:
# Decide what to do with captured stdout.
- if stdout_captured:
- os.rename(stdout.name, os.path.join(cwd or os.curdir, stdout_captured))
- else:
- os.remove(stdout.name)
+ if stdout:
+ if stdout_captured:
+ os.rename(stdout.name, os.path.join(cwd or os.curdir, stdout_captured))
+ else:
+ os.remove(stdout.name)
diff --git a/pipeline/compressors/__init__.py b/pipeline/compressors/__init__.py
index 4926ea7..6043a24 100644
--- a/pipeline/compressors/__init__.py
+++ b/pipeline/compressors/__init__.py
@@ -14,7 +14,7 @@ from django.utils.six import string_types
from pipeline.conf import settings
from pipeline.exceptions import CompressorError
-from pipeline.utils import to_class, relpath
+from pipeline.utils import to_class, relpath, set_std_streams_blocking
URL_DETECTOR = r"""url\((['"]){0,1}\s*(.*?)["']{0,1}\)"""
URL_REPLACER = r"""url\(__EMBED__(.+?)(\?\d+)?\)"""
@@ -248,6 +248,7 @@ class SubProcessCompressor(CompressorBase):
if content:
content = smart_bytes(content)
stdout, stderr = pipe.communicate(content)
+ set_std_streams_blocking()
if stderr.strip() and pipe.returncode != 0:
raise CompressorError(stderr)
elif self.verbose:
diff --git a/pipeline/conf.py b/pipeline/conf.py
index b220522..b6dd5b7 100644
--- a/pipeline/conf.py
+++ b/pipeline/conf.py
@@ -1,11 +1,16 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
+import os
import collections
import shlex
from django.conf import settings as _settings
-from django.core.signals import setting_changed
+try:
+ from django.core.signals import setting_changed
+except ImportError:
+ # Django < 1.8
+ from django.test.signals import setting_changed
from django.dispatch import receiver
from django.utils.six import string_types
@@ -13,9 +18,13 @@ from django.utils.six import string_types
DEFAULTS = {
'PIPELINE_ENABLED': not _settings.DEBUG,
+ 'PIPELINE_COLLECTOR_ENABLED': True,
+
'PIPELINE_ROOT': _settings.STATIC_ROOT,
'PIPELINE_URL': _settings.STATIC_URL,
+ 'SHOW_ERRORS_INLINE': _settings.DEBUG,
+
'CSS_COMPRESSOR': 'pipeline.compressors.yuglify.YuglifyCompressor',
'JS_COMPRESSOR': 'pipeline.compressors.yuglify.YuglifyCompressor',
'COMPILERS': [],
@@ -95,7 +104,7 @@ class PipelineSettings(collections.MutableMapping):
value = self.settings[key]
if key.endswith(("_BINARY", "_ARGUMENTS")):
if isinstance(value, string_types):
- return tuple(shlex.split(value))
+ return tuple(shlex.split(value, posix=(os.name == 'posix')))
return tuple(value)
return value
diff --git a/pipeline/exceptions.py b/pipeline/exceptions.py
index 6276f48..4152b97 100644
--- a/pipeline/exceptions.py
+++ b/pipeline/exceptions.py
@@ -10,7 +10,11 @@ class PackageNotFound(PipelineException):
class CompilerError(PipelineException):
- pass
+ def __init__(self, msg, command=None, error_output=None):
+ super(CompilerError, self).__init__(msg)
+
+ self.command = command
+ self.error_output = error_output.strip()
class CompressorError(PipelineException):
diff --git a/pipeline/glob.py b/pipeline/glob.py
index 932fa6a..ee3ee81 100644
--- a/pipeline/glob.py
+++ b/pipeline/glob.py
@@ -25,12 +25,7 @@ def iglob(pathname):
"""
if not has_magic(pathname):
- try:
- if staticfiles_storage.exists(pathname):
- yield pathname
- except NotImplementedError:
- # Being optimistic
- yield pathname
+ yield pathname
return
dirname, basename = os.path.split(pathname)
if not dirname:
diff --git a/pipeline/jinja2/__init__.py b/pipeline/jinja2/__init__.py
index e19a358..d5aeb8f 100644
--- a/pipeline/jinja2/__init__.py
+++ b/pipeline/jinja2/__init__.py
@@ -34,7 +34,7 @@ class PipelineExtension(PipelineMixin, Extension):
package = self.package_for(package_name, 'css')
except PackageNotFound:
return '' # fail silently, do not return anything if an invalid group is specified
- return self.render_compressed(package, 'css')
+ return self.render_compressed(package, package_name, 'css')
def render_css(self, package, path):
template_name = package.template_name or "pipeline/css.jinja"
@@ -55,7 +55,7 @@ class PipelineExtension(PipelineMixin, Extension):
package = self.package_for(package_name, 'js')
except PackageNotFound:
return '' # fail silently, do not return anything if an invalid group is specified
- return self.render_compressed(package, 'js')
+ return self.render_compressed(package, package_name, 'js')
def render_js(self, package, path):
template_name = package.template_name or "pipeline/js.jinja"
diff --git a/pipeline/templates/pipeline/compile_error.html b/pipeline/templates/pipeline/compile_error.html
new file mode 100644
index 0000000..a3a816e
--- /dev/null
+++ b/pipeline/templates/pipeline/compile_error.html
@@ -0,0 +1,31 @@
+<div id="django-pipeline-error-{{package_name}}" class="django-pipeline-error"
+ style="display: none; border: 2px #DD0000 solid; margin: 1em; padding: 1em; background: white;">
+ <h1>Error compiling {{package_type}} package "{{package_name}}"</h1>
+ <p><strong>Command:</strong></p>
+ <pre style="white-space: pre-wrap;">{{command}}</pre>
+ <p><strong>Errors:</strong></p>
+ <pre style="white-space: pre-wrap;">{{errors}}</pre>
... 16239 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