Permalink
Browse files

Merge branch 'hotfix/1.1.2'

  • Loading branch information...
2 parents 89b734f + ee7336a commit 1b511bccea1f95b65d60131481292920f4f59089 @jezdez jezdez committed Jan 10, 2012
Showing with 9 additions and 4 deletions.
  1. +1 −1 compressor/__init__.py
  2. +5 −0 docs/changelog.txt
  3. +2 −2 docs/conf.py
  4. +1 −1 setup.py
View
@@ -1,2 +1,2 @@
# following PEP 386, versiontools will pick it up
-__version__ = (1, 1, 1, "final", 0)
+__version__ = (1, 1, 2, "final", 0)
View
@@ -1,6 +1,11 @@
Changelog
=========
+v1.1.2
+------
+
+- Fixed an installation issue related to versiontools.
+
v1.1.1
------
View
@@ -41,7 +41,7 @@
# General information about the project.
project = u'Django Compressor'
-copyright = u'2011, Django Compressor authors'
+copyright = u'2012, Django Compressor authors'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -50,7 +50,7 @@
# The short X.Y version.
version = '1.1'
# The full version, including alpha/beta/rc tags.
-release = '1.1.1'
+release = '1.1.2'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
View
@@ -126,6 +126,6 @@ def find_package_data(
'django-appconf >= 0.4',
],
setup_requires = [
- 'versiontools >= 1.6',
+ 'versiontools >= 1.8.2',
],
)

0 comments on commit 1b511bc

Please sign in to comment.