From 2ebd8e2892576b9f68265c0d955264a83b53070c Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Mon, 6 Mar 2017 21:58:52 +0100 Subject: [PATCH] Drop reverse migration dependency --- README.rst | 23 +++++++++++++++---- .../migrations/0017_thumbnail_move.py | 3 --- .../migrations/0018_thumbnail_move2.py | 5 ---- .../migrations/0019_thumbnail_move3.py | 5 ---- .../migrations/0020_thumbnail_move4.py | 5 ---- 5 files changed, 19 insertions(+), 22 deletions(-) diff --git a/README.rst b/README.rst index 9ffeda5..aeb6f34 100644 --- a/README.rst +++ b/README.rst @@ -71,23 +71,38 @@ Migrating cmsplugin-filer to 1.1 and djangocms-blog up to 0.8.4 If you have djangocms-blog up to 0.8.4 (included) installed or you are upgrading from a previous djangocms-blog version together with cmsplugin-filer upgrade, you can just apply the migrations:: - pip install cmsplugin-filer==1.1.1 django-filer==1.2.2 djangocms-blog==0.8.4 + pip install cmsplugin-filer==1.1.3 django-filer==1.2.7 djangocms-blog==0.8.4 python manage.py migrate Migrating cmsplugin-filer to 1.1 and djangocms-blog 0.8.5+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -If you already a djangocms-blog 0.8.5+ or above, you have to de-apply some blog migrations when -doing the upgrade:: +If you already a djangocms-blog 0.8.5+ up to 0.8.11, upgrade to 0.8.11, then +you have to de-apply some blog migrations when doing the upgrade:: + pip install djangocms-blog==0.8.11 python manage.py migrate djangocms_blog 0017 ## reverse for these migration is a noop - pip install cmsplugin-filer==1.1.1 django-filer==1.2.2 + pip install cmsplugin-filer==1.1.3 django-filer==1.2.7 python manage.py migrate +After this step you can upgrade to 0.8.12:: + + pip install djangocms-blog==0.8.12 + .. note:: de-apply migration **before** upgrading cmsplugin-filer. If running before upgrade, the backward migration won't alter anything on the database, and it will just allow the code to migrate ``ThumbnailOption`` from cmsplugin-filer to filer +.. note:: If you upgrade in a Django 1.10 environment, be sure to upgrade both packages + at the same time to allow correct migration dependencies to be evaluated. + +Installing djangocms-blog in an existing project with Django 1.10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +If your project has cmsplugin-filer 1.1+ already installed and it uses Django 1.10, +install djangocms-blog 0.8.12 (and above):: + + pip install djangocms-blog==0.8.12 ******** Features diff --git a/djangocms_blog/migrations/0017_thumbnail_move.py b/djangocms_blog/migrations/0017_thumbnail_move.py index f125639..b6d3a7b 100644 --- a/djangocms_blog/migrations/0017_thumbnail_move.py +++ b/djangocms_blog/migrations/0017_thumbnail_move.py @@ -13,9 +13,6 @@ class Migration(migrations.Migration): ('filer', '0003_thumbnailoption'), ('cmsplugin_filer_image', '0003_mv_thumbnail_option_to_filer_20160119_1720'), ] - run_before = [ - ('cmsplugin_filer_image', '0004_auto_20160120_0950'), - ] operations = [ migrations.AlterField( diff --git a/djangocms_blog/migrations/0018_thumbnail_move2.py b/djangocms_blog/migrations/0018_thumbnail_move2.py index be5b3df..5fddd90 100644 --- a/djangocms_blog/migrations/0018_thumbnail_move2.py +++ b/djangocms_blog/migrations/0018_thumbnail_move2.py @@ -10,11 +10,6 @@ class Migration(migrations.Migration): if 'cmsplugin_filer' not in thumbnail_model: dependencies = [ ('djangocms_blog', '0017_thumbnail_move'), - ('filer', '0003_thumbnailoption'), - ('cmsplugin_filer_image', '0003_mv_thumbnail_option_to_filer_20160119_1720'), - ] - run_before = [ - ('cmsplugin_filer_image', '0004_auto_20160120_0950'), ] operations = [ diff --git a/djangocms_blog/migrations/0019_thumbnail_move3.py b/djangocms_blog/migrations/0019_thumbnail_move3.py index 5253093..ea4f7f5 100644 --- a/djangocms_blog/migrations/0019_thumbnail_move3.py +++ b/djangocms_blog/migrations/0019_thumbnail_move3.py @@ -25,11 +25,6 @@ class Migration(migrations.Migration): if 'cmsplugin_filer' not in thumbnail_model: dependencies = [ ('djangocms_blog', '0018_thumbnail_move2'), - ('filer', '0003_thumbnailoption'), - ('cmsplugin_filer_image', '0003_mv_thumbnail_option_to_filer_20160119_1720'), - ] - run_before = [ - ('cmsplugin_filer_image', '0004_auto_20160120_0950'), ] operations = [ diff --git a/djangocms_blog/migrations/0020_thumbnail_move4.py b/djangocms_blog/migrations/0020_thumbnail_move4.py index 5968ca0..b895cb1 100644 --- a/djangocms_blog/migrations/0020_thumbnail_move4.py +++ b/djangocms_blog/migrations/0020_thumbnail_move4.py @@ -10,11 +10,6 @@ class Migration(migrations.Migration): if 'cmsplugin_filer' not in thumbnail_model: dependencies = [ ('djangocms_blog', '0019_thumbnail_move3'), - ('filer', '0003_thumbnailoption'), - ('cmsplugin_filer_image', '0003_mv_thumbnail_option_to_filer_20160119_1720'), - ] - run_before = [ - ('cmsplugin_filer_image', '0004_auto_20160120_0950'), ] operations = [