From 42e622b8d0cdb38aed075b6b3a95b1603da89cf8 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 5 Dec 2011 14:41:05 -0400 Subject: [PATCH 1/3] Update requirements to include new django-compressor version --- requirements/development.txt | 2 +- requirements/production.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/development.txt b/requirements/development.txt index d363fd07d9..251f11e5e0 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -16,6 +16,6 @@ pdfminer==20110227 APScheduler==2.0.2 Pillow==1.7.4 cssmin==0.1.4 -django-compressor==1.1 +django-compressor==1.1.1 -e git://github.com/rosarior/django-sendfile.git#egg=django-sendfile djangorestframework==0.2.3 diff --git a/requirements/production.txt b/requirements/production.txt index e2654a82b1..c9b455a807 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -13,6 +13,6 @@ pdfminer==20110227 APScheduler==2.0.2 Pillow==1.7.4 cssmin==0.1.4 -django-compressor==1.1 +django-compressor==1.1.1 -e git://github.com/rosarior/django-sendfile.git#egg=django-sendfile djangorestframework==0.2.3 From 068b24b4cc6e842f8bb37fcc0b59ff0747cb945b Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 5 Dec 2011 14:41:28 -0400 Subject: [PATCH 2/3] Update documentation --- docs/changelog.rst | 9 +++++++++ docs/conf.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index ca07319a67..d06397f62c 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,3 +1,12 @@ +Version 0.10.1 +-------------- +* Upgraded django-compressor to version 1.1.1, run:: + + $ pip install --upgrade -r requirements/production.txt + + to upgrade + + Version 0.10 ------------ * Added a proper setup views for the document grouping functionality. diff --git a/docs/conf.py b/docs/conf.py index 45126bf88f..2b9ba3a5ff 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -48,7 +48,7 @@ copyright = u'2011, Roberto Rosario' # built documents. # # The short X.Y version. -version = '0.10' +version = '0.10.1' # The full version, including alpha/beta/rc tags. release = '0.10' From 52a8fca5d9d8ffd41813a31b032747066223905f Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 5 Dec 2011 14:41:46 -0400 Subject: [PATCH 3/3] Bump version to 0.10.1 --- apps/main/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/main/__init__.py b/apps/main/__init__.py index 0532245481..b1fc639174 100644 --- a/apps/main/__init__.py +++ b/apps/main/__init__.py @@ -21,7 +21,7 @@ admin_site = {'text': _(u'admin site'), 'view': 'admin:index', 'famfam': 'keyboa __version_info__ = { 'major': 0, 'minor': 10, - 'micro': 0, + 'micro': 1, 'releaselevel': 'final', 'serial': 0 }