diff --git a/.flake8 b/.flake8 index d3837af..c74ed57 100644 --- a/.flake8 +++ b/.flake8 @@ -1,5 +1,5 @@ [flake8] -ignore = E203, E266, E501, W503, F403, F401, F841 +ignore = W503 max-line-length = 89 max-complexity = 10 select = B,C,E,F,W,T4,B9 diff --git a/admin_interface/migrations/0011_add_environment_options.py b/admin_interface/migrations/0011_add_environment_options.py index 70f3472..ab06b9e 100644 --- a/admin_interface/migrations/0011_add_environment_options.py +++ b/admin_interface/migrations/0011_add_environment_options.py @@ -25,7 +25,7 @@ class Migration(migrations.Migration): field=colorfield.fields.ColorField( blank=True, default="#E74C3C", - help_text="(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: #3498DB)", + help_text="(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: #3498DB)", # noqa: E501 max_length=10, verbose_name="color", ), diff --git a/admin_interface/models.py b/admin_interface/models.py index 70d6e65..c119bb8 100644 --- a/admin_interface/models.py +++ b/admin_interface/models.py @@ -107,12 +107,16 @@ class Theme(models.Model): verbose_name=_("favicon"), ) - env_name = models.CharField(blank=True, max_length=50, verbose_name=_("name")) + env_name = models.CharField( + blank=True, + max_length=50, + verbose_name=_("name"), + ) env_color = ColorField( blank=True, default="#E74C3C", help_text=_( - "(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: #3498DB)" + "(red: #E74C3C, orange: #E67E22, yellow: #F1C40F, green: #2ECC71, blue: #3498DB)" # noqa: E501 ), max_length=10, verbose_name=_("color"), @@ -223,7 +227,8 @@ class Theme(models.Model): verbose_name=_("link hover color"), ) css_module_rounded_corners = models.BooleanField( - default=True, verbose_name=_("rounded corners") + default=True, + verbose_name=_("rounded corners"), ) css_generic_link_color = ColorField( @@ -285,7 +290,10 @@ class Theme(models.Model): verbose_name=_("text color"), ) - related_modal_active = models.BooleanField(default=True, verbose_name=_("active")) + related_modal_active = models.BooleanField( + default=True, + verbose_name=_("active"), + ) related_modal_background_color = ColorField( blank=True, default="#000000", diff --git a/tests/test_models.py b/tests/test_models.py index 49ff785..bcffdba 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -1,9 +1,8 @@ import random import shutil -from unittest import expectedFailure from django.conf import settings -from django.test import TestCase, TransactionTestCase +from django.test import TestCase from admin_interface.models import Theme @@ -45,25 +44,25 @@ class AdminInterfaceModelsTestCase(TestCase): def test_default_theme_activated_after_update_if_multiple_active_themes(self): Theme.objects.all().delete() - theme_1 = Theme.objects.create(name="Custom 1", active=True) - theme_2 = Theme.objects.create(name="Custom 2", active=True) - theme_3 = Theme.objects.create(name="Custom 3", active=True) + Theme.objects.create(name="Custom 1", active=True) + Theme.objects.create(name="Custom 2", active=True) + Theme.objects.create(name="Custom 3", active=True) Theme.objects.update(active=False) Theme.objects.update(active=True) self.__test_active_theme() def test_default_theme_activated_on_active_theme_deleted(self): Theme.objects.all().delete() - theme_1 = Theme.objects.create(name="Custom 1", active=True) - theme_2 = Theme.objects.create(name="Custom 2", active=True) - theme_3 = Theme.objects.create(name="Custom 3", active=True) + Theme.objects.create(name="Custom 1", active=True) + Theme.objects.create(name="Custom 2", active=True) + Theme.objects.create(name="Custom 3", active=True) Theme.objects.filter(pk=Theme.objects.get_active().pk).delete() self.__test_active_theme() def test_last_theme_activated_on_multiple_themes_created(self): Theme.objects.all().delete() - theme_1 = Theme.objects.create(name="Custom 1", active=True) - theme_2 = Theme.objects.create(name="Custom 2", active=True) + Theme.objects.create(name="Custom 1", active=True) + Theme.objects.create(name="Custom 2", active=True) theme_3 = Theme.objects.create(name="Custom 3", active=True) self.assertEqual(Theme.objects.get_active().pk, theme_3.pk) self.__test_active_theme() diff --git a/tests/test_multidb.py b/tests/test_multidb.py index 4b49489..018bcce 100644 --- a/tests/test_multidb.py +++ b/tests/test_multidb.py @@ -1,5 +1,3 @@ -from unittest import skipIf - from django.test import TestCase from admin_interface.models import Theme