From ee6f37d7d28d7b4aceb7868e137d337d700db8b9 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 8 Apr 2021 15:11:16 -0700 Subject: [PATCH] python formatting --- bookwyrm/activitypub/ordered_collection.py | 3 ++ .../migrations/0064_auto_20210408_2208.py | 28 +++++++++++++++++++ bookwyrm/tests/models/test_list.py | 5 +--- 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 bookwyrm/migrations/0064_auto_20210408_2208.py diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py index 135c50d3..650f6a40 100644 --- a/bookwyrm/activitypub/ordered_collection.py +++ b/bookwyrm/activitypub/ordered_collection.py @@ -55,6 +55,7 @@ class OrderedCollectionPage(ActivityObject): @dataclass(init=False) class CollectionItem(ActivityObject): """ an item in a collection """ + actor: str type: str = "CollectionItem" @@ -62,6 +63,7 @@ class CollectionItem(ActivityObject): @dataclass(init=False) class ListItem(CollectionItem): """ a book on a list """ + book: str notes: str = None approved: bool = True @@ -72,5 +74,6 @@ class ListItem(CollectionItem): @dataclass(init=False) class ShelfItem(CollectionItem): """ a book on a list """ + book: str type: str = "ShelfItem" diff --git a/bookwyrm/migrations/0064_auto_20210408_2208.py b/bookwyrm/migrations/0064_auto_20210408_2208.py new file mode 100644 index 00000000..84a1a128 --- /dev/null +++ b/bookwyrm/migrations/0064_auto_20210408_2208.py @@ -0,0 +1,28 @@ +# Generated by Django 3.1.6 on 2021-04-08 22:08 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0063_auto_20210408_1556"), + ] + + operations = [ + migrations.AlterField( + model_name="listitem", + name="book_list", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to="bookwyrm.list" + ), + ), + migrations.AlterField( + model_name="shelfbook", + name="shelf", + field=models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.shelf" + ), + ), + ] diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py index f6ed0c96..48f918a0 100644 --- a/bookwyrm/tests/models/test_list.py +++ b/bookwyrm/tests/models/test_list.py @@ -65,10 +65,7 @@ class List(TestCase): ) item = models.ListItem.objects.create( - book_list=book_list, - book=self.book, - user=self.local_user, - approved=False + book_list=book_list, book=self.book, user=self.local_user, approved=False ) self.assertFalse(item.approved)