Merge branch 'master' into yuglify-200

Author: RDIL

.travis.yml

@@ -46,18 +46,30 @@ matrix:
       python: "3.5"
     - env: TOXENV=py36-django111
       python: "3.6"
-    - env: TOXENV=py34-django-master
+    - env: TOXENV=py34-django20
       python: "3.4"
+    - env: TOXENV=py35-django20
+      python: "3.5"
+    - env: TOXENV=py36-django20
+      python: "3.6"
+    - env: TOXENV=py37-django20
+      python: "3.7-dev"
     - env: TOXENV=py35-django-master
       python: "3.5"
     - env: TOXENV=py36-django-master
       python: "3.6"
+    - env: TOXENV=py37-django-master
+      python: "3.7-dev"
     - env: TOXENV=docs
       python: "2.7"
   allow_failures:
-    - env: TOXENV=py34-django-master
+    - env: TOXENV=py34-django20
+    - env: TOXENV=py35-django20
+    - env: TOXENV=py36-django20
+    - env: TOXENV=py37-django20
     - env: TOXENV=py35-django-master
     - env: TOXENV=py36-django-master
+    - env: TOXENV=py37-django-master
 before_install:
   - nvm install node
   - nvm use node

README.rst

@@ -17,6 +17,11 @@ Pipeline
     :alt: PYPI
     :target: https://badge.fury.io/py/django-pipeline
 
+.. image:: https://readthedocs.org/projects/django-pipeline/badge/?version=latest
+    :alt: Documentation Status
+    :target: https://django-pipeline.readthedocs.io/en/latest/?badge=latest
+
+
 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.

package.json

@@ -21,7 +21,7 @@
     "cssmin": "latest",
     "google-closure-compiler": "latest",
     "uglify-js": "latest",
-    "yuglify": "latest",
+    "yuglify": "1.0.x",
     "yuicompressor": "latest"
   }
 }

pipeline/compilers/__init__.py

@@ -148,6 +148,8 @@ def execute_command(self, command, cwd=None, stdout_captured=None):
             # Decide what to do with captured stdout.
             if stdout:
                 if stdout_captured:
-                    shutil.move(stdout.name, os.path.join(cwd or os.curdir, stdout_captured))
+                    output_filename = os.path.join(cwd or os.curdir, stdout_captured)
+                    shutil.move(stdout.name, output_filename)
+                    os.chmod(output_filename, 420) # 644 in decimal
                 else:
                     os.remove(stdout.name)

pipeline/conf.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 import os
-import collections
+from collections import MutableMapping
 import shlex
 
 from django.conf import settings as _settings
@@ -91,7 +91,7 @@
 }
 
 
-class PipelineSettings(collections.MutableMapping):
+class PipelineSettings(MutableMapping):
     """
     Container object for pipeline settings
     """

tests/assets/compressors/yuglify.js

@@ -1 +1 @@
-(function(){window.concat=function(){console.log(arguments)},window.cat=function(){console.log("hello world")}}).call(this)
+(function(){!function(){window.concat=function(){console.log(arguments)}}(),function(){window.cat=function(){console.log("hello world")}}()}).call(this);

tox.ini

@@ -12,6 +12,7 @@ basepython =
   py34: python3.4
   py35: python3.5
   py36: python3.6
+  py37: python3.7
 deps =
   py{27,py}: mock
   py{27,py}: futures
@@ -21,6 +22,7 @@ deps =
   django19: Django>=1.9,<1.10
   django110: Django>=1.10,<1.11
   django111: Django>=1.11,<1.12
+  django20: Django>=2.0,<2.1
   django-master: https://github.com/django/django/archive/master.tar.gz
   jinja2
   coverage