Merge pull request #49 from unicef/feature/validate_programme

validate program checs for individuals too

Author: domdinicola

pyproject.toml

@@ -97,32 +97,6 @@ dev-dependencies = [
     "ruff>=0.9.3",
 ]
 
-[tool.black]
-line-length = 120
-include = '\.pyi?$'
-exclude = '''
-/(
-    \.git
-  | \.pytest_cache
-  | \.tox
-  | \.venv
-  | ~build
-  | build
-  | ops
-  | migrations
-)/
-'''
-
-#[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]
 django_settings_module = "country_workspace.config.settings"

ruff.toml

@@ -80,8 +80,7 @@ force-wrap-aliases = true
 combine-as-imports = true
 extra-standard-library = ["path"]
 known-third-party = ['django']
-known-first-party = ['hope_*']
-known-local-folder = ["country_workspace"]
+known-first-party = ['country_workspace']
 no-sections = false
 lines-after-imports = 1
 relative-imports-order = "furthest-to-closest"

src/country_workspace/apps.py

@@ -15,6 +15,7 @@ def ready(self) -> None:
         import django_celery_boost.admin
 
         import country_workspace.compat.admin_extra_buttons as c
+
         from .utils import flags  # noqa
 
         admin_extra_buttons.api.confirm_action = c.confirm_action

src/country_workspace/cache/manager.py

@@ -10,10 +10,11 @@
 from redis_lock.django_cache import RedisCache
 from sentry_sdk import capture_exception
 
-from .signals import cache_get, cache_invalidate, cache_set
 from country_workspace import VERSION
 from country_workspace.state import state
 
+from .signals import cache_get, cache_invalidate, cache_set
+
 if TYPE_CHECKING:
     from ..models import Office, Program
 logger = logging.getLogger(__name__)

src/country_workspace/contrib/hope/client.py

@@ -8,9 +8,10 @@
 from constance import config
 from requests.exceptions import RequestException
 
-from .signals import hope_request_end, hope_request_start
 from country_workspace.exceptions import RemoteError
 
+from .signals import hope_request_end, hope_request_start
+
 if TYPE_CHECKING:
     JsonType = None | int | str | bool | list["JsonType"] | dict[str, "JsonType"]
     FlatJsonType = dict[str, str | int | bool]

src/country_workspace/contrib/hope/geo.py

@@ -4,12 +4,12 @@
 from django import forms
 from django.core.exceptions import ValidationError
 from django.utils.text import slugify
-
 from hope_flex_fields.mixin import ChildFieldMixin
 
+from country_workspace.cache.manager import cache_manager
+
 from ...exceptions import RemoteError
 from .client import HopeClient
-from country_workspace.cache.manager import cache_manager
 
 logger = logging.getLogger(__name__)
 

src/country_workspace/contrib/hope/remotes/country.py

@@ -1,7 +1,6 @@
 from typing import TYPE_CHECKING
 
 from django import forms
-
 from hope_flex_fields.attributes.abstract import AbstractAttributeHandler, AttributeHandlerConfig
 
 if TYPE_CHECKING:

src/country_workspace/contrib/hope/sync/office.py

@@ -1,12 +1,12 @@
 from io import TextIOBase
 
 from django.core.cache import cache
-
 from hope_flex_fields.models import DataChecker
 
+from country_workspace.models import Office, Program, SyncLog
+
 from .. import constants
 from ..client import HopeClient
-from country_workspace.models import Office, Program, SyncLog
 
 
 def sync_offices(stdout: TextIOBase | None = None) -> dict[str, int]:

src/country_workspace/datasources/rdi.py

@@ -1,7 +1,6 @@
 import io
 
 from django.db.transaction import atomic
-
 from hope_smart_import.readers import open_xls_multi
 
 from country_workspace.models import AsyncJob, Batch, Household

src/country_workspace/models/base.py

@@ -14,7 +14,6 @@
 
 if TYPE_CHECKING:
     from django.db.models import QuerySet
-
     from hope_flex_fields.models import DataChecker
 
     from country_workspace.models import Office, Program