Merge branch 'release/1.4'

Author: diox

.gitignore

@@ -2,6 +2,8 @@ build
 compressor/tests/static/CACHE
 compressor/tests/static/custom
 compressor/tests/static/js/066cd253eada.js
+compressor/tests/static/test.txt*
+
 dist
 MANIFEST
 *.pyc
@@ -10,3 +12,4 @@ MANIFEST
 docs/_build/
 .sass-cache
 .coverage
+.tox

.travis.yml

@@ -1,23 +1,22 @@
 language: python
-python:
-  - "2.6"
-  - "2.7"
 before_install:
-  - export PIP_USE_MIRRORS=true
-  - export PIP_INDEX_URL=https://simple.crate.io/
   - sudo apt-get update
   - sudo apt-get install csstidy libxml2-dev libxslt-dev
 install:
-  - pip install -e .
-  - pip install -r requirements/tests.txt Django==$DJANGO
+  - pip install tox coveralls
 script:
-  - make test
+  - tox
 env:
-  - DJANGO=1.3.7
-  - DJANGO=1.4.5
-  - DJANGO=1.5
-branches:
-  only:
-    - develop
+  - TOXENV=py33-1.6.X
+  - TOXENV=py32-1.6.X
+  - TOXENV=py27-1.6.X
+  - TOXENV=py26-1.6.X
+  - TOXENV=py33-1.5.X
+  - TOXENV=py32-1.5.X
+  - TOXENV=py27-1.5.X
+  - TOXENV=py26-1.5.X
+  - TOXENV=py27-1.4.X
+  - TOXENV=py26-1.4.X
 notifications:
   irc: "irc.freenode.org#django-compressor"
+after_success: coveralls

AUTHORS

@@ -55,9 +55,11 @@ Jonathan Lukens
 Julian Scheid
 Julien Phalip
 Justin Lilly
+Lucas Tan
 Luis Nell
 Lukas Lehner
-Lukasz Balcerzak
+Łukasz Balcerzak
+Łukasz Langa
 Maciek Szczesniak
 Maor Ben-Dayan
 Mark Lavin
@@ -89,4 +91,4 @@ Ulrich Petri
 Ulysses V
 Vladislav Poluhin
 wesleyb
-Wilson Júnior
+Wilson Júnior

LICENSE

@@ -1,6 +1,6 @@
 django_compressor
 -----------------
-Copyright (c) 2009-2013 Django Compressor authors (see AUTHORS file)
+Copyright (c) 2009-2014 Django Compressor authors (see AUTHORS file)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

MANIFEST.in

@@ -1,7 +1,10 @@
 include AUTHORS
 include README.rst
 include LICENSE
+include Makefile
+include tox.ini
 recursive-include docs *
+recursive-include requirements *
 recursive-include compressor/templates/compressor *.html
 recursive-include compressor/tests/media *.js *.css *.png *.coffee
 recursive-include compressor/tests/test_templates *.html

Makefile

@@ -1,4 +1,11 @@
+testenv:
+	pip install -e .
+	pip install -r requirements/tests.txt
+	pip install Django
+
 test:
-	flake8 compressor --ignore=E501,E128
+	flake8 compressor --ignore=E501,E128,E701,E261,E301,E126,E127,E131
 	coverage run --branch --source=compressor `which django-admin.py` test --settings=compressor.test_settings compressor
 	coverage report --omit=compressor/test*,compressor/filters/jsmin/rjsmin*,compressor/filters/cssmin/cssmin*,compressor/utils/stringformat*
+
+.PHONY: test

README.rst

@@ -1,12 +1,21 @@
 Django Compressor
 =================
 
-.. image:: https://secure.travis-ci.org/jezdez/django_compressor.png?branch=develop
+.. image:: https://coveralls.io/repos/django-compressor/django-compressor/badge.png?branch=develop 
+  :target: https://coveralls.io/r/django-compressor/django-compressor?branch=develop
+
+.. image:: https://pypip.in/v/django_compressor/badge.png
+        :target: https://pypi.python.org/pypi/django_compressor
+
+.. image:: https://pypip.in/d/django_compressor/badge.png
+        :target: https://pypi.python.org/pypi/django_compressor
+
+.. image:: https://secure.travis-ci.org/django-compressor/django-compressor.png?branch=develop
     :alt: Build Status
-    :target: http://travis-ci.org/jezdez/django_compressor
+    :target: http://travis-ci.org/django-compressor/django-compressor
 
 Django Compressor combines and compresses linked and inline Javascript
-or CSS in a Django templates into cacheable static files by using the
+or CSS in a Django template into cacheable static files by using the
 ``compress`` template tag.
 
 HTML in between ``{% compress js/css %}`` and ``{% endcompress %}`` is
@@ -19,10 +28,10 @@ compresses it using ``jsmin``.
 
 As the final result the template tag outputs a ``<script>`` or ``<link>``
 tag pointing to the optimized file. These files are stored inside a folder
-and given an unique name based on their content. Alternatively it can also
+and given a unique name based on their content. Alternatively it can also
 return the resulting content to the original template directly.
 
-Since the file name is dependend on the content these files can be given
+Since the file name is dependent on the content these files can be given
 a far future expiration date without worrying about stale browser caches.
 
 The concatenation and compressing process can also be jump started outside
@@ -39,9 +48,10 @@ html5lib_ based parser, as well as an abstract base class that makes it easy to
 write a custom parser.
 
 Django Compressor also comes with built-in support for `CSS Tidy`_,
-`YUI CSS and JS`_ compressor, the Google's `Closure Compiler`_, a Python
-port of Douglas Crockford's JSmin_, a Python port of the YUI CSS Compressor
-cssmin_ and a filter to convert (some) images into `data URIs`_.
+`YUI CSS and JS`_ compressor, `yUglify CSS and JS`_ compressor, the Google's
+`Closure Compiler`_, a Python port of Douglas Crockford's JSmin_, a Python port
+of the YUI CSS Compressor cssmin_ and a filter to convert (some) images into
+`data URIs`_.
 
 If your setup requires a different compressor or other post-processing
 tool it will be fairly easy to implement a custom filter. Simply extend
@@ -51,21 +61,21 @@ More documentation about the usage and settings of Django Compressor can be
 found on `django-compressor.readthedocs.org`_.
 
 The source code for Django Compressor can be found and contributed to on
-`github.com/jezdez/django_compressor`_. There you can also file tickets.
+`github.com/django-compressor/django-compressor`_. There you can also file tickets.
 
-The `in-development version`_ of Django Compressor can be installed with
-``pip install django_compressor==dev`` or ``easy_install django_compressor==dev``.
+The in-development version of Django Compressor can be installed with
+``pip install http://github.com/django-compressor/django-compressor/tarball/develop``.
 
 .. _BeautifulSoup: http://www.crummy.com/software/BeautifulSoup/
 .. _lxml: http://lxml.de/
 .. _html5lib: http://code.google.com/p/html5lib/
 .. _CSS Tidy: http://csstidy.sourceforge.net/
 .. _YUI CSS and JS: http://developer.yahoo.com/yui/compressor/
+.. _yUglify CSS and JS: https://github.com/yui/yuglify
 .. _Closure Compiler: http://code.google.com/closure/compiler/
 .. _JSMin: http://www.crockford.com/javascript/jsmin.html
 .. _cssmin: https://github.com/zacharyvoase/cssmin
 .. _data URIs: http://en.wikipedia.org/wiki/Data_URI_scheme
 .. _django-compressor.readthedocs.org: http://django-compressor.readthedocs.org/en/latest/
-.. _github.com/jezdez/django_compressor: https://github.com/jezdez/django_compressor
-.. _in-development version: http://github.com/jezdez/django_compressor/tarball/develop#egg=django_compressor-dev
+.. _github.com/django-compressor/django-compressor: https://github.com/django-compressor/django-compressor
 

compressor/__init__.py

@@ -1,2 +1,2 @@
 # following PEP 386
-__version__ = "1.3"
+__version__ = "1.4a1"