updates:

- updates import sorting rules
- add sync data from HOPE in upgrade

Author: saxix

.pre-commit-config.yaml

@@ -10,11 +10,6 @@ repos:
     -   id: djade
         args: [--target-version, "5.1"]  # Use current Django version
 
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        stages: [pre-commit]
   - repo: https://github.com/twisted/towncrier
     rev: 24.8.0
     hooks:

pyproject.toml

@@ -113,15 +113,15 @@ exclude = '''
 )/
 '''
 
-[tool.isort]
-profile = "black"
-line_length = 120
-default_section = "THIRDPARTY"
-known_first_party = []
-known_django = "django"
-sections = ["FUTURE","STDLIB","DJANGO","THIRDPARTY","FIRSTPARTY","LOCALFOLDER"]
-include_trailing_comma = true
-skip = ["migrations", "snapshots", ".venv"]
+#[tool.isort]
+#profile = "black"
+#line_length = 120
+#default_section = "THIRDPARTY"
+#known_first_party = []
+#known_django = "django"
+#sections = ["FUTURE","STDLIB","DJANGO","THIRDPARTY","FIRSTPARTY","LOCALFOLDER"]
+#include_trailing_comma = true
+#skip = ["migrations", "snapshots", ".venv"]
 
 
 [tool.django-stubs]

ruff.toml

@@ -1,9 +1,6 @@
 target-version = "py312"
 line-length = 120
 
-[lint.isort]
-case-sensitive = true
-
 [lint]
 select = [
     "A", # prevent using keywords that clobber python builtins
@@ -77,6 +74,22 @@ indent-style = "space"
 skip-magic-trailing-comma = false
 line-ending = "auto"
 
+[lint.isort]
+case-sensitive = true
+force-wrap-aliases = true
+combine-as-imports = true
+extra-standard-library = ["path"]
+#default-section = "local-folder"
+known-third-party = ['django']
+known-first-party = ['hope_*']
+known-local-folder = ["country_workspace"]
+no-sections = false
+lines-after-imports = 1
+relative-imports-order = "furthest-to-closest"
+
+section-order = ["future", "standard-library", "third-party", "first-party",  "local-folder",]
+
+
 [lint.per-file-ignores]
 "tests/**.py" = ["S101", "PLR2004", "S", "SIM117", "D", "UP", "PLR0913", "ANN", "N999"]
 "src/**/versioning/**.py" = ["N999", ]

src/country_workspace/admin/__init__.py

@@ -1,7 +1,6 @@
 from django.contrib.admin.sites import site
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
-
 from smart_admin.console import panel_migrations, panel_redis, panel_sentry, panel_sysinfo
 from smart_admin.smart_auth.admin import ContentTypeAdmin, PermissionAdmin
 

src/country_workspace/admin/base.py

@@ -1,7 +1,6 @@
-from django.contrib import admin
-
 from admin_extra_buttons.mixins import ExtraButtonsMixin
 from adminfilters.mixin import AdminAutoCompleteSearchMixin, AdminFiltersMixin
+from django.contrib import admin
 
 
 class BaseModelAdmin(ExtraButtonsMixin, AdminAutoCompleteSearchMixin, AdminFiltersMixin, admin.ModelAdmin):

src/country_workspace/admin/batch.py

@@ -1,10 +1,9 @@
-from django.contrib import admin
-from django.http import HttpRequest
-from django.urls import reverse
-
 from admin_extra_buttons.buttons import LinkButton
 from admin_extra_buttons.decorators import link
 from adminfilters.autocomplete import AutoCompleteFilter, LinkedAutoCompleteFilter
+from django.contrib import admin
+from django.http import HttpRequest
+from django.urls import reverse
 
 from ..models import Batch
 from .base import BaseModelAdmin

src/country_workspace/admin/household.py

@@ -1,12 +1,11 @@
 from typing import TYPE_CHECKING
 
-from django.contrib import admin, messages
-from django.urls import reverse
-from django.utils.translation import gettext as _
-
 from admin_extra_buttons.buttons import LinkButton
 from admin_extra_buttons.decorators import button, link
 from adminfilters.autocomplete import LinkedAutoCompleteFilter
+from django.contrib import admin, messages
+from django.urls import reverse
+from django.utils.translation import gettext as _
 
 from ..models import Household
 from .base import BaseModelAdmin

src/country_workspace/admin/individual.py

@@ -1,10 +1,9 @@
 from typing import TYPE_CHECKING
 
-from django.contrib import admin
-from django.urls import reverse
-
 from admin_extra_buttons.decorators import link
 from adminfilters.autocomplete import LinkedAutoCompleteFilter
+from django.contrib import admin
+from django.urls import reverse
 
 from ..models import Individual
 from .base import BaseModelAdmin

src/country_workspace/admin/job.py

@@ -1,8 +1,7 @@
 from typing import TYPE_CHECKING, Sequence
 
-from django.contrib import admin
-
 from adminfilters.autocomplete import AutoCompleteFilter, LinkedAutoCompleteFilter
+from django.contrib import admin
 from django_celery_boost.admin import CeleryTaskModelAdmin
 
 from ..models import AsyncJob

src/country_workspace/admin/locations.py

@@ -1,15 +1,14 @@
 import logging
 from typing import TYPE_CHECKING
 
+from adminfilters.autocomplete import AutoCompleteFilter
+from adminfilters.filters import NumberFilter
+from adminfilters.mixin import AdminFiltersMixin
 from django.contrib import admin
 from django.contrib.admin import ModelAdmin, RelatedFieldListFilter
 from django.db.models import Field
 from django.forms import FileField, FileInput, Form
 
-from adminfilters.autocomplete import AutoCompleteFilter
-from adminfilters.filters import NumberFilter
-from adminfilters.mixin import AdminFiltersMixin
-
 from country_workspace.models.locations import Area, AreaType, Country
 
 if TYPE_CHECKING: