From 5de03cb159023b9460ed18388777cf02c2e69adb Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Fri, 5 Dec 2014 21:17:17 +0100 Subject: [PATCH 1/3] fully enable Django 1.7 test failures on travis --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56c926b..ebadd2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,6 @@ matrix: env: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1 allow_failures: - - python: 2.7 - env: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1 - python: 3.3 env: DJANGO='django>=1.5,<1.6' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1 - python: 3.3 @@ -43,4 +41,4 @@ matrix: - python: 3.4 env: DJANGO='django>=1.6,<1.7' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1 - python: 3.4 - env: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1 \ No newline at end of file + env: DJANGO='django>=1.7,<1.8' NOSE_COVER_PACKAGE="djangocms_blog" NOSE_WITH_COVERAGE=1 From 4fe6ba7fd54ec3a836455527d3a04bc11ab232b3 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Fri, 5 Dec 2014 21:17:27 +0100 Subject: [PATCH 2/3] Update documentation --- HISTORY.rst | 1 + README.rst | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index ec97e73..718f4ca 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -17,6 +17,7 @@ History toolbar items are removed from the toolbar in the post detail view to avoid confusings page meta / tags with post ones * Plugin API changed to filter out posts according to the request. +* Django 1.7 support 0.2.0 (2014-09-24) ++++++++++++++++++ diff --git a/README.rst b/README.rst index 2203e19..caf8c7b 100644 --- a/README.rst +++ b/README.rst @@ -30,6 +30,7 @@ Supported Django versions: * Django 1.5 * Django 1.6 +* Django 1.7 Supported django CMS versions: @@ -46,6 +47,11 @@ Supported django CMS versions: argument. Templates has been changed to use a context variable instead. Please update your plugin templates accordingly. +.. warning:: To ease migration to version 0.3, djangocms-blog depends on south + even on Django 1.7; while this is unnecessary for Dajngo 1.7, it + makes transition to version 0.3 painless. Hard dependency will be + removed in 0.5. + Quickstart ---------- From f5eb1ba187a2b5854cb23da764f28520c0ec1cdc Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Fri, 5 Dec 2014 21:17:55 +0100 Subject: [PATCH 3/3] Add dependency on south --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index e05cff9..dd9087b 100755 --- a/setup.py +++ b/setup.py @@ -49,6 +49,7 @@ setup( 'cmsplugin-filer', 'django-meta>=0.2', 'django-meta-mixin>=0.1.1', + 'south>=1.0.1', ], license="BSD", zip_safe=False,