From e1acdd006274c7a7d0f4d071c9149c299f81b764 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 10 Jul 2022 09:53:43 +1000 Subject: [PATCH] fix migrations There was a conflict due to the order of migrations. Hopefully this commit fixes it! --- ...show_guided_tour.py => 0154_user_show_guided_tour.py} | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) rename bookwyrm/migrations/{0151_user_show_guided_tour.py => 0154_user_show_guided_tour.py} (68%) diff --git a/bookwyrm/migrations/0151_user_show_guided_tour.py b/bookwyrm/migrations/0154_user_show_guided_tour.py similarity index 68% rename from bookwyrm/migrations/0151_user_show_guided_tour.py rename to bookwyrm/migrations/0154_user_show_guided_tour.py index ebdb46b75..62c8326dc 100644 --- a/bookwyrm/migrations/0151_user_show_guided_tour.py +++ b/bookwyrm/migrations/0154_user_show_guided_tour.py @@ -1,7 +1,6 @@ -# Generated by Django 3.2.13 on 2022-06-13 01:59 +# Generated by Django 3.2.14 on 2022-07-09 23:33 -import bookwyrm.models.fields -from django.db import migrations +from django.db import migrations, models def existing_users_default(apps, schema_editor): @@ -13,14 +12,14 @@ def existing_users_default(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ("bookwyrm", "0150_readthrough_stopped_date"), + ("bookwyrm", "0153_merge_20220706_2141"), ] operations = [ migrations.AddField( model_name="user", name="show_guided_tour", - field=bookwyrm.models.fields.BooleanField(default=True), + field=models.BooleanField(default=True), ), migrations.RunPython(existing_users_default, migrations.RunPython.noop), ]