From 6ab7e498ece973bacfe12726a713e5693e52171e Mon Sep 17 00:00:00 2001 From: Rebecca Lovewell <rebecca@caktusgroup.com> Date: Fri, 31 Jan 2014 17:27:58 -0500 Subject: [PATCH 1/6] Upgrade django-markitup from 1.0.0 -> 2.1 For Django 1.6 compatibility. --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 2ee30364..5c625849 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,7 +1,7 @@ Django==1.4.5 django-appconf==0.5 django-forms-bootstrap==2.0.3.post2 -django-markitup==1.0.0 +django-markitup==2.1 django-model-utils==1.1.0 django-reversion==1.7 django-sitetree==0.9.4 From 8b7b09731484f5bf8fd2d50d54beaf85a188d6b5 Mon Sep 17 00:00:00 2001 From: Rebecca Lovewell <rebecca@caktusgroup.com> Date: Fri, 31 Jan 2014 17:28:54 -0500 Subject: [PATCH 2/6] Update django-reversion from 1.7 -> 1.8 For Django 1.6 compatibility. --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 5c625849..47519e56 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -3,7 +3,7 @@ django-appconf==0.5 django-forms-bootstrap==2.0.3.post2 django-markitup==2.1 django-model-utils==1.1.0 -django-reversion==1.7 +django-reversion==1.8 django-sitetree==0.9.4 django-taggit==0.9.3 django-timezones==0.2 From 6d4e7b1eb1660cab6095ca5ba50eb49c276abaf8 Mon Sep 17 00:00:00 2001 From: Rebecca Lovewell <rebecca@caktusgroup.com> Date: Fri, 31 Jan 2014 17:29:36 -0500 Subject: [PATCH 3/6] Update django-sitetree from 0.9.4 -> 1.0.0 For Django 1.6 compatibility. --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 47519e56..03bdf391 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,7 +4,7 @@ django-forms-bootstrap==2.0.3.post2 django-markitup==2.1 django-model-utils==1.1.0 django-reversion==1.8 -django-sitetree==0.9.4 +django-sitetree==1.0.0 django-taggit==0.9.3 django-timezones==0.2 django-user-accounts==1.0b13 From 8e852901071a320a0796701ef0ae8bf331877e94 Mon Sep 17 00:00:00 2001 From: Rebecca Lovewell <rebecca@caktusgroup.com> Date: Fri, 31 Jan 2014 17:30:05 -0500 Subject: [PATCH 4/6] Update django-taggit from 0.9.3 -> 0.11.2 For Django 1.6 compatibility. --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 03bdf391..31452f50 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -5,7 +5,7 @@ django-markitup==2.1 django-model-utils==1.1.0 django-reversion==1.8 django-sitetree==1.0.0 -django-taggit==0.9.3 +django-taggit==0.11.2 django-timezones==0.2 django-user-accounts==1.0b13 easy-thumbnails==1.2 From e92dee1e0e33c87dce88387364996b460a9c3d36 Mon Sep 17 00:00:00 2001 From: Rebecca Lovewell <rebecca@caktusgroup.com> Date: Fri, 31 Jan 2014 17:30:32 -0500 Subject: [PATCH 5/6] Update easy-thumbnails from 1.2 -> 1.4 For Django 1.6 compatibility. --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 31452f50..bffba110 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,6 +8,6 @@ django-sitetree==1.0.0 django-taggit==0.11.2 django-timezones==0.2 django-user-accounts==1.0b13 -easy-thumbnails==1.2 +easy-thumbnails==1.4 html5lib==0.95 markdown==2.3.1 From 8d5461d05de53197cb3d90ed9098877418917392 Mon Sep 17 00:00:00 2001 From: Rebecca Lovewell <rebecca@caktusgroup.com> Date: Fri, 31 Jan 2014 17:31:32 -0500 Subject: [PATCH 6/6] Loosen Django requirement So that each project may control which version of Django to use. Not all of the latest requirements are compatible with Django 1.4 anymore. --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index bffba110..11be4891 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,4 @@ -Django==1.4.5 +Django>=1.5,<=1.6 django-appconf==0.5 django-forms-bootstrap==2.0.3.post2 django-markitup==2.1