Merge branch 'release/0.9' into develop

This commit is contained in:
Jannis Leidel
2011-05-18 12:21:59 +02:00
9 changed files with 5 additions and 13 deletions

View File

@@ -1,4 +1,4 @@
VERSION = (0, 8, 0, "f", 0) # following PEP 386
VERSION = (0, 9, 0, "f", 0) # following PEP 386
DEV_N = None

View File

@@ -1,5 +1,4 @@
import os
import socket
from django.core.files.base import ContentFile
from django.template.loader import render_to_string

View File

@@ -1,5 +1,3 @@
import os
from compressor.conf import settings
from compressor.base import Compressor, SOURCE_HUNK, SOURCE_FILE
from compressor.exceptions import UncompressableFileError

View File

@@ -1,5 +1,3 @@
import os
from compressor.conf import settings
from compressor.base import Compressor, SOURCE_HUNK, SOURCE_FILE
from compressor.exceptions import UncompressableFileError

View File

@@ -1,6 +1,5 @@
from HTMLParser import HTMLParser
from django.utils.encoding import smart_unicode
from django.utils.datastructures import SortedDict
from compressor.exceptions import ParserError
from compressor.parser import ParserBase

View File

@@ -5,7 +5,6 @@ import coverage
from os.path import join
from django.conf import settings
from django.core.management import call_command
TEST_DIR = os.path.dirname(os.path.abspath(__file__))

View File

@@ -1,7 +1,6 @@
from __future__ import with_statement
import os
import re
import socket
import sys
from unittest2 import skipIf

View File

@@ -1,8 +1,8 @@
Changelog
=========
HEAD
----
0.9
---
- Fixed the precompiler support to also use the full file path instead of a
temporarily created file.

View File

@@ -48,9 +48,9 @@ copyright = u'2011, Django Compressor authors'
# built documents.
#
# The short X.Y version.
version = '0.8'
version = '0.9'
# The full version, including alpha/beta/rc tags.
release = '0.8'
release = '0.9'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.