updates deps

pyproject.toml

@@ -14,15 +14,15 @@ Pillow = "^9.0.1"
 celery = "^5.2.6"
 cryptography = "*"
 django = "^3"
-django-admin-extra-buttons = ">=1.5.6"
+django-admin-extra-buttons = ">=1.5.7"
 django-admin-ordering = "*"
 django-admin-sync = ">=0.7.1"
 django-adminactions = "^2"
-django-adminfilters = "^2"
+django-adminfilters = "^2.3"
 django-appconf = "^1.0.5"
 django-bitfield = "^2.1"
 django-click = "^2.3"
-django-concurrency = "^2.4"
+django-concurrency = "^2.5"
 django-constance = "^2.8"
 django-cors-headers = "^3.11.0"
 django-csp = "^3.7"
@@ -127,8 +127,8 @@ include_trailing_comma = true
 known_django = "django"
 known_typing = ["typing"]
 known_tests = ["unittest", "pytest"]
-known_app = "hope_country_report"
-sections = ["FUTURE", 'TYPING', 'STDLIB',"TESTS",'DJANGO','THIRDPARTY','APP','LOCALFOLDER']
+known_app = "aurora"
+sections = ["FUTURE", 'TYPING', 'STDLIB',"TESTS",'DJANGO', 'FIRSTPARTY', 'THIRDPARTY','APP','LOCALFOLDER']
 multi_line_output = 3
 line_length = 120
 balanced_wrapping = true

src/aurora/administration/apps.py

@@ -8,6 +8,7 @@ class AuroraAdminConfig(AppConfig):
     def ready(self):
         super().ready()
         from django.contrib.admin import site
+
         from smart_admin.console import (
             panel_email,
             panel_error_page,

src/aurora/administration/filters.py

@@ -1,14 +1,19 @@
-from adminfilters.autocomplete import get_real_field
-from adminfilters.mixin import MediaDefinitionFilter, SmartFieldListFilter
 from django.conf import settings
 from django.contrib.admin.widgets import SELECT2_TRANSLATIONS
 from django.urls import reverse
 from django.utils.translation import get_language
 
+from adminfilters.autocomplete import AutoCompleteFilter, get_real_field
+from adminfilters.mixin import MediaDefinitionFilter, SmartFieldListFilter
+
 from aurora.core.version_media import VersionMedia
 
 
-class BaseAutoCompleteFilter(SmartFieldListFilter, MediaDefinitionFilter):
+class BaseAutoCompleteFilter(AutoCompleteFilter):
+    pass
+
+
+class BaseAutoCompleteFilter___(SmartFieldListFilter, MediaDefinitionFilter):
     template = "adminfilters/autocomplete.html"
     url_name = "%s:%s_%s_autocomplete"
     filter_title = None

src/aurora/administration/forms.py

@@ -1,10 +1,11 @@
 import base64
 import urllib.parse
 
-import sqlparse
 from django import forms
 from django.core.exceptions import ValidationError
 
+import sqlparse
+
 
 class ImportForm(forms.Form):
     file = forms.FileField()

src/aurora/administration/hijack.py

@@ -1,4 +1,5 @@
 from django.contrib.auth import login
+
 from hijack import signals
 from hijack.templatetags.hijack import can_hijack
 from hijack.views import get_used_backend, keep_session_age

src/aurora/administration/mixin.py

@@ -3,13 +3,14 @@
 import tempfile
 from pathlib import Path
 
-from admin_extra_buttons.decorators import button
-from admin_extra_buttons.mixins import ExtraButtonsMixin
-from concurrency.api import disable_concurrency
 from django.contrib import messages
 from django.core.management import call_command
 from django.http import JsonResponse
 
+from admin_extra_buttons.decorators import button
+from admin_extra_buttons.mixins import ExtraButtonsMixin
+from concurrency.api import disable_concurrency
+
 from aurora.core.utils import render
 
 from .forms import ImportForm

src/aurora/administration/panels.py

@@ -4,15 +4,16 @@
 import tempfile
 from pathlib import Path
 
-import sqlparse
-from concurrency.api import disable_concurrency
 from django.contrib import messages
 from django.core.exceptions import PermissionDenied
 from django.core.management import call_command
-from django.db import DEFAULT_DB_ALIAS, connections
+from django.db import connections, DEFAULT_DB_ALIAS
 from django.http import JsonResponse
 from django.shortcuts import render
 
+import sqlparse
+from concurrency.api import disable_concurrency
+
 from .. import VERSION
 from ..core.utils import is_root
 from ..security.models import UserProfile

src/aurora/administration/templates/admin/base_site.html

@@ -17,5 +17,4 @@ <h1 id="site-name"><a href="{% url 'admin:index' %}">{{ site_header|default:_('D
 {% block nav-global %}{% endblock %}
 {% block footer %}
     {{ block.super }}
-    {% include "admin/_footer.html" %}
 {% endblock %}

src/aurora/api/router.py

@@ -1,4 +1,5 @@
 from django.http import HttpResponseForbidden
+
 from rest_framework.routers import APIRootView, DefaultRouter
 
 

src/aurora/api/serializers/flatpage.py

@@ -1,4 +1,5 @@
 from django.contrib.flatpages.models import FlatPage
+
 from rest_framework import serializers
 
 

src/aurora/api/serializers/record.py

@@ -1,4 +1,5 @@
 from django.utils.functional import cached_property
+
 from rest_framework import serializers
 from rest_framework.fields import empty
 from rest_framework.reverse import reverse

src/aurora/api/serializers/template.py

@@ -1,7 +1,7 @@
-from rest_framework import serializers
-
 from dbtemplates.models import Template
 
+from rest_framework import serializers
+
 
 class TemplateSerializer(serializers.ModelSerializer):
     class Meta:

src/aurora/api/viewsets/base.py

@@ -1,26 +1,14 @@
-from django_filters import rest_framework as filters
-from django_filters import utils
+from dbtemplates.models import Template
+
+from django_filters import rest_framework as filters, utils
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import viewsets
-from rest_framework.authentication import (
-    BasicAuthentication,
-    SessionAuthentication,
-    TokenAuthentication,
-)
+from rest_framework.authentication import BasicAuthentication, SessionAuthentication, TokenAuthentication
 from rest_framework.permissions import BasePermission, DjangoModelPermissions
 
-from aurora.core.models import (
-    CustomFieldType,
-    FlexForm,
-    FlexFormField,
-    OptionSet,
-    Organization,
-    Project,
-    Validator,
-)
+from aurora.core.models import CustomFieldType, FlexForm, FlexFormField, OptionSet, Organization, Project, Validator
 from aurora.core.utils import is_root
 from aurora.registration.models import Record, Registration
-from dbtemplates.models import Template
 
 
 class LastModifiedFilter(filters.FilterSet):

src/aurora/api/viewsets/registration.py

@@ -7,6 +7,7 @@
 
 from django.http import HttpRequest, HttpResponse
 from django.utils.cache import get_conditional_response
+
 from django_filters import rest_framework as filters
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import status

src/aurora/api/viewsets/sys.py

@@ -1,9 +1,10 @@
 import os
 
-from constance import config
 from django.conf import settings
 from django.http import JsonResponse
 
+from constance import config
+
 from aurora.core.utils import has_token
 
 

src/aurora/api/viewsets/template.py

@@ -1,7 +1,7 @@
-from rest_framework import serializers
-
 from dbtemplates.models import Template
 
+from rest_framework import serializers
+
 from .base import SmartViewSet
 
 

src/aurora/api/viewsets/user.py

@@ -1,6 +1,7 @@
 from django.contrib.auth import get_user_model
 from django.urls import reverse
 from django.utils.translation import get_language
+
 from rest_framework import serializers
 from rest_framework.authentication import SessionAuthentication
 from rest_framework.decorators import action

src/aurora/api/viewsets/validator.py

@@ -1,4 +1,5 @@
 from django.http import HttpResponse
+
 from rest_framework.authentication import SessionAuthentication
 from rest_framework.decorators import action
 from rest_framework.permissions import AllowAny

src/aurora/config/asgi.py

@@ -1,11 +1,11 @@
 import os
 
-# from channels.auth import AuthMiddlewareStack
-from channels.routing import ProtocolTypeRouter
-
 # from channels.security.websocket import AllowedHostsOriginValidator
 from django.core.asgi import get_asgi_application
 
+# from channels.auth import AuthMiddlewareStack
+from channels.routing import ProtocolTypeRouter
+
 # import aurora.core.channels
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "aurora.config.settings")

src/aurora/config/urls.py

@@ -1,10 +1,11 @@
-import adminactions.actions as actions
-import debug_toolbar
 from django.conf import settings
 from django.conf.urls.i18n import i18n_patterns
 from django.contrib import admin
 from django.urls import include, path, re_path
 
+import adminactions.actions as actions
+import debug_toolbar
+
 from aurora.core.views import service_worker
 from aurora.web.views.site import error_404
 

src/aurora/core/admin/base.py

@@ -1,10 +1,11 @@
 import logging
 
+from django.conf import settings
+from django.core.cache import caches
+
 from admin_extra_buttons.decorators import button
 from admin_sync.utils import is_local
 from concurrency.api import disable_concurrency
-from django.conf import settings
-from django.core.cache import caches
 from reversion_compare.admin import CompareVersionAdmin
 
 from ..utils import is_root

src/aurora/core/admin/custom_field.py

@@ -1,10 +1,11 @@
 import logging
 
-from admin_extra_buttons.decorators import button
 from django import forms
 from django.contrib.admin import register
 from django.core.cache import caches
 from django.db.models import JSONField
+
+from admin_extra_buttons.decorators import button
 from jsoneditor.forms import JSONEditor
 from smart_admin.modeladmin import SmartModelAdmin
 

src/aurora/core/admin/field_editor.py

@@ -1,6 +1,7 @@
-import json
 from typing import Dict
 
+import json
+
 from django import forms
 from django.conf import settings
 from django.core.cache import caches
@@ -151,8 +152,7 @@ def get_configuration(self):
         return HttpResponse(rendered, content_type="text/plain")
 
     def get_code(self):
-        from bs4 import BeautifulSoup as bs
-        from bs4 import formatter
+        from bs4 import BeautifulSoup as bs, formatter
         from pygments import highlight
         from pygments.formatters.html import HtmlFormatter
         from pygments.lexers import HtmlLexer

src/aurora/core/admin/filters.py

@@ -1,13 +1,14 @@
 import logging
 
-from adminfilters.autocomplete import AutoCompleteFilter
-from adminfilters.combo import ChoicesFieldComboFilter, RelatedFieldComboFilter
 from django.contrib.admin.options import IncorrectLookupParameters
 from django.core.cache import caches
 from django.core.exceptions import ValidationError
 from django.db.models import Q
 from django.urls import reverse
 
+from adminfilters.autocomplete import AutoCompleteFilter
+from adminfilters.combo import ChoicesFieldComboFilter, RelatedFieldComboFilter
+
 from ...administration.filters import BaseAutoCompleteFilter
 
 logger = logging.getLogger(__name__)

src/aurora/core/admin/flex_field.py

@@ -1,14 +1,15 @@
 import logging
 
-from admin_extra_buttons.decorators import button, view
-from admin_ordering.admin import OrderableAdmin
-from adminfilters.autocomplete import AutoCompleteFilter
-from adminfilters.querystring import QueryStringFilter
 from django import forms
 from django.contrib import messages
 from django.contrib.admin import register
 from django.core.cache import caches
 from django.db.models import JSONField
+
+from admin_extra_buttons.decorators import button, view
+from admin_ordering.admin import OrderableAdmin
+from adminfilters.autocomplete import AutoCompleteFilter
+from adminfilters.querystring import QueryStringFilter
 from jsoneditor.forms import JSONEditor
 from smart_admin.modeladmin import SmartModelAdmin
 

src/aurora/core/admin/flex_form.py

@@ -1,16 +1,16 @@
 import logging
 
+from django import forms
+from django.contrib import messages
+from django.contrib.admin import register, TabularInline
+from django.core.cache import caches
+
 from admin_extra_buttons.decorators import button, view
 from admin_ordering.admin import OrderableAdmin
 from adminfilters.autocomplete import AutoCompleteFilter
 from adminfilters.querystring import QueryStringFilter
-from django import forms
-from django.contrib import messages
-from django.contrib.admin import TabularInline, register
-from django.core.cache import caches
 from smart_admin.modeladmin import SmartModelAdmin
 
-from ...administration.mixin import LoadDumpMixin
 from ..admin_sync import SyncMixin
 from ..models import FlexForm, FlexFormField, FormSet
 from ..utils import render
@@ -47,7 +47,7 @@ def __init__(self, *args, **kwargs):
             self.fields["name"].widget.attrs = {"readonly": True, "tyle": "background-color:#f8f8f8;border:none"}
 
 
-class FlexFormFieldInline(LoadDumpMixin, OrderableAdmin, TabularInline):
+class FlexFormFieldInline(OrderableAdmin, TabularInline):
     template = "admin/core/flexformfield/tabular.html"
     model = FlexFormField
     form = FlexFormFieldFormInline

src/aurora/core/admin/form_editor.py

@@ -1,6 +1,7 @@
-import json
 from typing import Dict
 
+import json
+
 from django import forms
 from django.core.cache import caches
 from django.forms import Media
@@ -95,8 +96,7 @@ def get_configuration(self):
         return HttpResponse(rendered, content_type="text/plain")
 
     def get_code(self):
-        from bs4 import BeautifulSoup as bs
-        from bs4 import formatter
+        from bs4 import BeautifulSoup as bs, formatter
         from pygments import highlight
         from pygments.formatters.html import HtmlFormatter
         from pygments.lexers import HtmlLexer