Permalink
Browse files

Merge branch 'release/1.0.1'

  • Loading branch information...
jezdez committed Sep 7, 2011
2 parents bb3185b + c76100e commit c726239f23447011796172d49aff22af5fbe0db0
Showing with 37 additions and 32 deletions.
  1. +1 −1 compressor/__init__.py
  2. +3 −4 compressor/utils/staticfiles.py
  3. +29 −23 docs/changelog.txt
  4. +1 −1 docs/conf.py
  5. +3 −3 setup.py
View
@@ -1,2 +1,2 @@
# following PEP 386, versiontools will pick it up
-__version__ = (1, 0, 0, "final", 0)
+__version__ = (1, 0, 1, "final", 0)
@@ -5,10 +5,7 @@
from compressor.conf import settings
INSTALLED = ("staticfiles" in settings.INSTALLED_APPS or
- "django.contrib.staticfiles" in settings.INSTALLED_APPS)
-
-finders = None
-settings = None
+ "django.contrib.staticfiles" in settings.INSTALLED_APPS)
if INSTALLED:
if "django.contrib.staticfiles" in settings.INSTALLED_APPS:
@@ -26,3 +23,5 @@
"When using Django Compressor together with staticfiles, "
"please add 'compressor.finders.CompressorFinder' to the "
"STATICFILES_FINDERS setting.")
+else:
+ finders = None
View
@@ -1,7 +1,13 @@
Changelog
=========
-HEAD
+v1.0.1
+------
+
+- Fixed regression in ``compressor.utils.staticfiles`` compatibility
+ module.
+
+v1.0
----
- **BACKWARDS-INCOMPATIBLE** Stopped swallowing exceptions raised by
@@ -51,20 +57,20 @@ HEAD
.. _`django-appconf`: http://django-appconf.rtfd.org/
.. _`versiontools`: http://pypi.python.org/pypi/versiontools
-0.9.2
------
+v0.9.2
+------
- Fixed stdin handling of precompiler filter.
-0.9.1
------
+v0.9.1
+------
- Fixed encoding related issue.
- Minor cleanups.
-0.9
----
+v0.9
+----
- Fixed the precompiler support to also use the full file path instead of a
temporarily created file.
@@ -75,8 +81,8 @@ HEAD
- Switched from SHA1 to MD5 for hash generation to lower the computational impact.
-0.8
----
+v0.8
+----
- Replace naive jsmin.py with rJSmin (http://opensource.perlig.de/rjsmin/)
and fixed a few problems with JavaScript comments.
@@ -89,13 +95,13 @@ HEAD
please make sure a fourth item is returned in the iterable that denotes
the base name of the file that is compressed.
-0.7.1
------
+v0.7.1
+------
- Fixed import error when using the standalone django-staticfiles app.
-0.7
----
+v0.7
+----
- Created new parser, HtmlParser, based on the stdlib HTMLParser module.
@@ -108,13 +114,13 @@ HEAD
- Updated bundled jsmin to use version by Dave St.Germain that was refactored for speed.
-0.6.4
------
+v0.6.4
+------
- Fixed Closure filter argument handling.
-0.6.3
------
+v0.6.3
+------
- Fixed options mangling in CompilerFilter initialization.
@@ -128,14 +134,14 @@ HEAD
- Restructered parsers and added a html5lib based parser.
-0.6.2
------
+v0.6.2
+------
- Minor bugfixes that caused the compression not working reliably in
development mode (e.g. updated files didn't trigger a new compression).
-0.6.1
------
+v0.6.1
+------
- Fixed staticfiles support to also use its finder API to find files during
developement -- when the static files haven't been collected in
@@ -144,8 +150,8 @@ HEAD
- Fixed regression with the ``COMPRESS`` setting, pre-compilation and
staticfiles.
-0.6
----
+v0.6
+----
Major improvements and a lot of bugfixes, some of which are:
View
@@ -50,7 +50,7 @@
# The short X.Y version.
version = '1.0'
# The full version, including alpha/beta/rc tags.
-release = '1.0'
+release = '1.0.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
View
@@ -110,7 +110,7 @@ def find_package_data(
packages = find_packages(exclude=['tests', 'tests.*']),
package_data = find_package_data('compressor', only_in_packages=False),
classifiers = [
- 'Development Status :: 4 - Beta',
+ 'Development Status :: 5 - Production/Stable',
'Framework :: Django',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
@@ -122,10 +122,10 @@ def find_package_data(
'Topic :: Internet :: WWW/HTTP',
],
zip_safe = False,
- install_requires=[
+ install_requires = [
'django-appconf >= 0.4',
],
- setup_requires=[
+ setup_requires = [
'versiontools >= 1.6',
],
)

0 comments on commit c726239

Please sign in to comment.