From d1c582493d8a319f24a1cabcc943e35da0eb7d4a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 18 Apr 2021 09:26:27 -0700 Subject: [PATCH 1/7] Update to django 3.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6b7d82d34..0bcc85993 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ celery==4.4.2 -Django==3.1.8 +Django==3.2.0 django-model-utils==4.0.0 environs==7.2.0 flower==0.9.4 From 141d1a9a17d7f9fd4c0715436e023f96f94b1ed8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 26 Apr 2021 11:22:08 -0700 Subject: [PATCH 2/7] Adds auto field setting to avoid hella warnings --- bookwyrm/settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index fb5488e7a..57bf28735 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -34,6 +34,8 @@ LOCALE_PATHS = [ os.path.join(BASE_DIR, "locale"), ] +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' + # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/ From cd869dde09af75c82f741d8768c21fe4423d67f1 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 26 Apr 2021 11:28:33 -0700 Subject: [PATCH 3/7] Fixes tests of bookwyrm abstract model --- bookwyrm/settings.py | 2 +- bookwyrm/tests/models/test_base_model.py | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 57bf28735..b679e2d44 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -34,7 +34,7 @@ LOCALE_PATHS = [ os.path.join(BASE_DIR, "locale"), ] -DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' +DEFAULT_AUTO_FIELD = "django.db.models.AutoField" # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/ diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index 5a8350b2e..41aff1fcd 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -26,20 +26,22 @@ class BaseModel(TestCase): outbox="https://example.com/users/rat/outbox", ) + class TestModel(base_model.BookWyrmModel): + """ just making it not abstract """ + self.test_model = TestModel() + def test_remote_id(self): """these should be generated""" - instance = base_model.BookWyrmModel() - instance.id = 1 - expected = instance.get_remote_id() - self.assertEqual(expected, "https://%s/bookwyrmmodel/1" % DOMAIN) + self.test_model.id = 1 + expected = self.test_model.get_remote_id() + self.assertEqual(expected, "https://%s/testmodel/1" % DOMAIN) def test_remote_id_with_user(self): """format of remote id when there's a user object""" - instance = base_model.BookWyrmModel() - instance.user = self.local_user - instance.id = 1 - expected = instance.get_remote_id() - self.assertEqual(expected, "https://%s/user/mouse/bookwyrmmodel/1" % DOMAIN) + self.test_model.user = self.local_user + self.test_model.id = 1 + expected = self.test_model.get_remote_id() + self.assertEqual(expected, "https://%s/user/mouse/testmodel/1" % DOMAIN) def test_set_remote_id(self): """this function sets remote ids after creation""" From b16ac91b16b8c2542a50cb7b6e57445225f864ac Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 26 Apr 2021 11:34:04 -0700 Subject: [PATCH 4/7] Python formatting --- bookwyrm/tests/models/test_base_model.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index 41aff1fcd..d500e8ea8 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -28,6 +28,7 @@ class BaseModel(TestCase): class TestModel(base_model.BookWyrmModel): """ just making it not abstract """ + self.test_model = TestModel() def test_remote_id(self): From ff8601f329c5b90b28ca7746071cfbb3694fdffb Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 26 Apr 2021 11:37:07 -0700 Subject: [PATCH 5/7] Fixes spacing for new Black release --- bookwyrm/tests/models/test_base_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index d500e8ea8..f473085bb 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -27,7 +27,7 @@ class BaseModel(TestCase): ) class TestModel(base_model.BookWyrmModel): - """ just making it not abstract """ + """just making it not abstract""" self.test_model = TestModel() From 7006f30ac8c0e4f6985de079d4834d920f5353c8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 26 Apr 2021 11:51:17 -0700 Subject: [PATCH 6/7] Uses unique test model name --- bookwyrm/tests/models/test_base_model.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index f473085bb..ef2cd900a 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -26,10 +26,10 @@ class BaseModel(TestCase): outbox="https://example.com/users/rat/outbox", ) - class TestModel(base_model.BookWyrmModel): + class BookWyrmTestModel(base_model.BookWyrmModel): """just making it not abstract""" - self.test_model = TestModel() + self.test_model = BookWyrmTestModel() def test_remote_id(self): """these should be generated""" From 55eb1c45263b403f0c9b3f06fcc6607b3cca35bf Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 26 Apr 2021 13:50:43 -0700 Subject: [PATCH 7/7] Fixes model name --- bookwyrm/tests/models/test_base_model.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index ef2cd900a..75d0444c1 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -35,14 +35,14 @@ class BaseModel(TestCase): """these should be generated""" self.test_model.id = 1 expected = self.test_model.get_remote_id() - self.assertEqual(expected, "https://%s/testmodel/1" % DOMAIN) + self.assertEqual(expected, "https://%s/bookwyrmtestmodel/1" % DOMAIN) def test_remote_id_with_user(self): """format of remote id when there's a user object""" self.test_model.user = self.local_user self.test_model.id = 1 expected = self.test_model.get_remote_id() - self.assertEqual(expected, "https://%s/user/mouse/testmodel/1" % DOMAIN) + self.assertEqual(expected, "https://%s/user/mouse/bookwyrmtestmodel/1" % DOMAIN) def test_set_remote_id(self): """this function sets remote ids after creation"""