Merge branch 'release/1.1.2'

docs/changelog.rst

@@ -1,6 +1,21 @@
 Changelog
 =========
 
+v1.1.2 (2011-08-25)
+-------------------
+
+* Fixed a minor bug in how `django-appconf`_ was used.
+
+v1.1.1 (2011-08-22)
+-------------------
+
+* Fixed resolution of relative paths in ``CachedStaticFilesStorage``.
+
+* Started to use `django-appconf`_ and `versiontools`_.
+
+.. _`django-appconf`: http://django-appconf.rtfd.org/
+.. _`versiontools`: http://pypi.python.org/pypi/versiontools
+
 v1.1 (2011-08-18)
 -----------------
 

docs/conf.py

@@ -56,7 +56,7 @@
 # The short X.Y version.
 version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.1'
+release = '1.1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -109,7 +109,7 @@ def find_package_data(
     packages=find_packages(exclude=["tests.*", "tests"]),
     package_data=find_package_data("staticfiles"),
     classifiers=[
-        "Development Status :: 3 - Alpha",
+        "Development Status :: 4 - Beta",
         "Environment :: Web Environment",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
@@ -122,7 +122,7 @@ def find_package_data(
     ],
     zip_safe=False,
     install_requires=[
-        'django-appconf >= 0.2.2',
+        'django-appconf >= 0.4',
     ],
     setup_requires=[
         'versiontools >= 1.6',

staticfiles/__init__.py

@@ -1,2 +1,2 @@
 # following PEP 386, versiontools will pick it up
-__version__ = (1, 1, 1, "final", 0)
+__version__ = (1, 1, 2, "final", 0)

staticfiles/models.py

@@ -32,10 +32,10 @@ def configure_root(self, value):
         Use STATIC_ROOT since it doesn't has the default prefix
         """
         root = value or getattr(settings, 'STATIC_ROOT', None)
-        if (self.MEDIA_ROOT and root) and (self.MEDIA_ROOT == root):
+        if (settings.MEDIA_ROOT and root) and (settings.MEDIA_ROOT == root):
             raise ImproperlyConfigured("The MEDIA_ROOT and STATIC_ROOT "
                                        "settings must have different values")
-        self.STATIC_ROOT = root
+        settings.STATIC_ROOT = root
         return root
 
     def configure_url(self, value):
@@ -47,10 +47,10 @@ def configure_url(self, value):
             raise ImproperlyConfigured("You're using the staticfiles app "
                                        "without having set the required "
                                        "STATIC_URL setting.")
-        if url == self.MEDIA_URL:
+        if url == settings.MEDIA_URL:
             raise ImproperlyConfigured("The MEDIA_URL and STATIC_URL "
                                        "settings must have different values")
-        self.STATIC_URL = url
+        settings.STATIC_URL = url
         return url