Run `pre-commit`.

master
Fabio Caccamo 2022-10-14 17:31:57 +02:00
parent aecfbf0291
commit 5e58c35b08
20 changed files with 42 additions and 45 deletions

View File

@ -1,10 +1,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.contrib import admin
from admin_interface.compat import gettext_lazy as _ from admin_interface.compat import gettext_lazy as _
from admin_interface.models import Theme from admin_interface.models import Theme
from django.contrib import admin
class ThemeAdmin(admin.ModelAdmin): class ThemeAdmin(admin.ModelAdmin):

View File

@ -1,10 +1,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from admin_interface.compat import gettext_lazy as _
from django.apps import AppConfig from django.apps import AppConfig
from django.db.models.signals import post_migrate from django.db.models.signals import post_migrate
from admin_interface.compat import gettext_lazy as _
class AdminInterfaceConfig(AppConfig): class AdminInterfaceConfig(AppConfig):

View File

@ -2,9 +2,8 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import models, migrations
import colorfield.fields import colorfield.fields
from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):

View File

@ -2,9 +2,8 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models
import colorfield.fields import colorfield.fields
from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):

View File

@ -3,7 +3,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import colorfield.fields import colorfield.fields
from django.db import migrations, models from django.db import migrations, models

View File

@ -3,7 +3,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import colorfield.fields import colorfield.fields
from django.db import migrations, models from django.db import migrations, models

View File

@ -3,7 +3,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import colorfield.fields import colorfield.fields
from django.db import migrations, models from django.db import migrations, models

View File

@ -3,7 +3,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import colorfield.fields import colorfield.fields
from django.db import migrations from django.db import migrations

View File

@ -2,11 +2,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import colorfield.fields
from django.db import migrations from django.db import migrations
from django.db.models import F from django.db.models import F
import colorfield.fields
def default_link_selected(apps, schema_editor): def default_link_selected(apps, schema_editor):
Theme = apps.get_model("admin_interface", "Theme") Theme = apps.get_model("admin_interface", "Theme")

View File

@ -2,10 +2,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from admin_interface.compat import FileExtensionValidator
from django.db import migrations, models from django.db import migrations, models
from admin_interface.compat import FileExtensionValidator
class Migration(migrations.Migration): class Migration(migrations.Migration):

View File

@ -6,13 +6,13 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('admin_interface', '0025_theme_language_chooser_control'), ("admin_interface", "0025_theme_language_chooser_control"),
] ]
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name='theme', model_name="theme",
name='list_filter_highlight', name="list_filter_highlight",
field=models.BooleanField(default=True, verbose_name='highlight active'), field=models.BooleanField(default=True, verbose_name="highlight active"),
), ),
] ]

View File

@ -6,13 +6,16 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('admin_interface', '0026_theme_list_filter_highlight'), ("admin_interface", "0026_theme_list_filter_highlight"),
] ]
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name='theme', model_name="theme",
name='list_filter_removal_links', name="list_filter_removal_links",
field=models.BooleanField(default=False, verbose_name='quick remove links for active filters at top of sidebar'), field=models.BooleanField(
default=False,
verbose_name="quick remove links for active filters at top of sidebar",
),
), ),
] ]

View File

@ -2,16 +2,15 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from admin_interface.cache import del_cached_active_theme
from admin_interface.compat import FileExtensionValidator, force_str, gettext_lazy as _
from colorfield.fields import ColorField from colorfield.fields import ColorField
from django.db import models from django.db import models
from django.db.models.signals import post_delete, post_save, pre_save from django.db.models.signals import post_delete, post_save, pre_save
from six import python_2_unicode_compatible from six import python_2_unicode_compatible
from admin_interface.cache import del_cached_active_theme
from admin_interface.compat import FileExtensionValidator, force_str
from admin_interface.compat import gettext_lazy as _
@python_2_unicode_compatible @python_2_unicode_compatible
class Theme(models.Model): class Theme(models.Model):
@ -341,8 +340,8 @@ class Theme(models.Model):
default=True, verbose_name=_("sticky position") default=True, verbose_name=_("sticky position")
) )
list_filter_removal_links = models.BooleanField( list_filter_removal_links = models.BooleanField(
default=False, verbose_name=_( default=False,
"quick remove links for active filters at top of sidebar") verbose_name=_("quick remove links for active filters at top of sidebar"),
) )
foldable_apps = models.BooleanField(default=True, verbose_name=_("foldable apps")) foldable_apps = models.BooleanField(default=True, verbose_name=_("foldable apps"))

View File

@ -1,9 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import django
import hashlib import hashlib
import re import re
import django
from django import template from django import template
from django.conf import settings from django.conf import settings
from django.template.loader import get_template from django.template.loader import get_template
@ -14,7 +14,6 @@ from admin_interface.compat import NoReverseMatch, reverse
from admin_interface.models import Theme from admin_interface.models import Theme
from admin_interface.version import __version__ from admin_interface.version import __version__
register = template.Library() register = template.Library()
if django.VERSION < (1, 9): if django.VERSION < (1, 9):

View File

@ -1,9 +1,10 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from setuptools import find_packages, setup import os
import sys
import os, sys from setuptools import find_packages, setup
exec(open("admin_interface/version.py").read()) exec(open("admin_interface/version.py").read())

View File

@ -2,9 +2,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import django
import os import os
import django
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
SECRET_KEY = "django-admin-interface" SECRET_KEY = "django-admin-interface"

View File

@ -2,12 +2,12 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.conf import settings
from django.test import TestCase
import random import random
import shutil import shutil
from django.conf import settings
from django.test import TestCase
from admin_interface.models import Theme from admin_interface.models import Theme
@ -21,7 +21,7 @@ class AdminInterfaceModelsTestCase(TestCase):
def __test_active_theme(self): def __test_active_theme(self):
theme = Theme.get_active_theme() theme = Theme.get_active_theme()
print(theme) print(theme)
self.assertTrue(theme != None) self.assertTrue(theme is not None)
self.assertTrue(theme.active) self.assertTrue(theme.active)
self.assertEqual(Theme.objects.filter(active=True).count(), 1) self.assertEqual(Theme.objects.filter(active=True).count(), 1)

View File

@ -5,7 +5,7 @@ from __future__ import unicode_literals
import django import django
from django.conf import settings from django.conf import settings
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.test import override_settings, TestCase from django.test import TestCase, override_settings
from admin_interface.settings import check_installed_apps from admin_interface.settings import check_installed_apps

View File

@ -2,9 +2,9 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.test import override_settings, TestCase
from django.test.client import RequestFactory
from django.template import Context, Template from django.template import Context, Template
from django.test import TestCase, override_settings
from django.test.client import RequestFactory
from admin_interface.models import Theme from admin_interface.models import Theme
from admin_interface.templatetags import admin_interface_tags as templatetags from admin_interface.templatetags import admin_interface_tags as templatetags

View File

@ -6,11 +6,12 @@ import django
from django.contrib import admin from django.contrib import admin
if django.VERSION < (2, 0): if django.VERSION < (2, 0):
from django.conf.urls import include, url as re_path from django.conf.urls import include
from django.conf.urls import url as re_path
else: else:
from django.urls import include, re_path from django.urls import include, re_path
from django.conf.urls.i18n import i18n_patterns
from django.conf.urls.i18n import i18n_patterns
urlpatterns = [] urlpatterns = []
urlpatterns += [ urlpatterns += [