updates

.flake8

@@ -1,6 +1,6 @@
 [flake8]
 max-complexity = 12
-max-line-length = 120
+max-line-length = 88
 exclude =
     .*/
     __pycache__
@@ -12,3 +12,4 @@ exclude =
 per-file-ignores =
     src/**/migrations/*.py:E501
     src/**/upgrade.py:E731
+    src/**/upgrade.py:E731

.github/codeql/codeql-config.yml

@@ -1,4 +1,4 @@
 name: 'App CodeQL Config'
 
 paths-ignore:
-  - '**/tests/**'
+  - '**/tests/**'

.pdm-python

@@ -1 +1 @@
-/Users/sax/Documents/data/PROGETTI/UNICEF/hope-country-workspace/.venv/bin/python
+/Users/sax/Documents/data/PROGETTI/UNICEF/hope-country-workspace/.venv/bin/python

docker/bin/wait-for-it.sh

@@ -179,4 +179,4 @@ if [[ $WAITFORIT_CLI != "" ]]; then
     exec "${WAITFORIT_CLI[@]}"
 else
     exit $WAITFORIT_RESULT
-fi
+fi

docker/conf/mime.types

@@ -2184,4 +2184,4 @@ video/x-sgi-movie				movie
 
 x-conference/x-cooltalk				ice
 x-epoc/x-sisx-app				sisx
-x-world/x-vrml					vrm vrml wrl
+x-world/x-vrml					vrm vrml wrl

manage.py

@@ -6,7 +6,9 @@
 sys.path.insert(0, SRC)
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "hope_country_workspace.config.settings")
+    os.environ.setdefault(
+        "DJANGO_SETTINGS_MODULE", "hope_country_workspace.config.settings"
+    )
 
     from django.core.management import execute_from_command_line
 

pyproject.toml

@@ -55,6 +55,7 @@ dev = [
     "responses>=0.25.3",
     "pytest-factoryboy>=2.7.0",
     "django-webtest>=1.9.11",
+    "pre-commit>=3.7.1",
 ]
 
 [tool.black]

src/hope_country_workspace/config/__init__.py

@@ -17,6 +17,13 @@ def setting(anchor: str) -> str:
     return f"@see {DJANGO_HELP_BASE}#{anchor}"
 
 
+def celery_doc(anchor: str) -> str:
+    return (
+        f"@see https://docs.celeryq.dev/en/stable/"
+        f"userguide/configuration.html#{anchor}"
+    )
+
+
 class Group(Enum):
     DJANGO = 1
 
@@ -46,18 +53,18 @@ class Group(Enum):
     "CELERY_TASK_ALWAYS_EAGER": (
         bool,
         False,
-        "https://docs.celeryq.dev/en/stable/userguide/configuration.html#std-setting-task_always_eager",
+        f"{celery_doc}#std-setting-task_always_eager",
         True,
     ),
     "CELERY_TASK_EAGER_PROPAGATES": (
         bool,
         True,
-        "https://docs.celeryq.dev/en/stable/userguide/configuration.html#task-eager-propagates",
+        f"{celery_doc}#task-eager-propagates",
     ),
     "CELERY_VISIBILITY_TIMEOUT": (
         int,
         1800,
-        "https://docs.celeryq.dev/en/stable/userguide/configuration.html#broker-transport-options",
+        f"{celery_doc}#broker-transport-options",
     ),
     "CSRF_COOKIE_SECURE": (bool, True, setting("csrf-cookie-secure")),
     "DATABASE_URL": (

src/hope_country_workspace/config/fragments/celery.py

@@ -1,7 +1,6 @@
 from ..settings import env  # type: ignore[attr-defined]
 
 CELERY_ACCEPT_CONTENT = ["pickle", "json", "application/text", "application/json"]
-# CELERY_BROKER_TRANSPORT_OPTIONS = {"visibility_timeout": int(CELERY_BROKER_VISIBILITY_VAR)}
 CELERY_BROKER_URL = env("CELERY_BROKER_URL")
 CELERY_BROKER_VISIBILITY_VAR = env("CELERY_VISIBILITY_TIMEOUT")
 

src/hope_country_workspace/config/fragments/csp.py

@@ -1,4 +1,5 @@
-# CSP_DEFAULT_SRC = ["'self'", "'unsafe-inline'", "'same-origin'", "fonts.googleapis.com", 'fonts.gstatic.com', 'data:',
+# CSP_DEFAULT_SRC = ["'self'", "'unsafe-inline'", "'same-origin'",
+#                   "fonts.googleapis.com", 'fonts.gstatic.com', 'data:',
 #                    'blob:', "cdn.redoc.ly"]
 CSP_DEFAULT_SRC = ["'self'", "'unsafe-inline'"]
 CSP_STYLE_SRC = [

src/hope_country_workspace/config/settings.py

@@ -190,7 +190,6 @@
 
 
 DEFAULT_FROM_EMAIL = "[email protected]"
-# EMAIL_BACKEND = "djcelery_email.backends.CeleryEmailBackend" # TODO: when ready, add djcelery_email
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 EMAIL_HOST = env("EMAIL_HOST", default="")
 EMAIL_HOST_USER = env("EMAIL_HOST_USER", default="")

src/hope_country_workspace/tenant/config.py

@@ -39,7 +39,7 @@ def __init__(self, prefix: str):
         setting_changed.connect(self._on_setting_changed)
 
     def _set_attr(self, prefixed_name: str, value: "Any") -> None:
-        name = prefixed_name[(len(self.prefix) + 1) :]
+        name = prefixed_name[(len(self.prefix) + 1) :]  # noqa
         setattr(self, name, value)
 
     @cached_property

src/hope_country_workspace/tenant/db.py

@@ -18,7 +18,8 @@ def get_tenant_filter(self) -> "Dict[str, Any]":
         tenant_filter_field = self.model.Tenant.tenant_filter_field
         if not tenant_filter_field:
             raise ValueError(
-                f"Set 'tenant_filter_field' on {self} or override `get_queryset()` to enable queryset filtering"
+                f"Set 'tenant_filter_field' on {self} or override "
+                f"`get_queryset()` to enable queryset filtering"
             )
         if tenant_filter_field == "__all__":
             return {}

src/hope_country_workspace/tenant/utils.py

@@ -83,9 +83,3 @@ def process_response(
         if response:
             state.set_cookies(response)
         state.reset()
-
-    # @contextlib.contextmanager
-    # def context(self, request: "AuthHttpRequest", response: "HttpResponse|None" = None) -> "Iterator[None]":
-    #     self.process_request(request)
-    #     yield
-    #     self.process_response(request, response)

tests/tenant/test_tenant_backend.py

@@ -5,6 +5,8 @@
 from django.contrib.auth.models import AnonymousUser
 
 import pytest
+from pytest_factoryboy import register
+from testutils.factories import UserFactory
 from testutils.perms import user_grant_permissions
 
 from hope_country_workspace.state import state
@@ -15,8 +17,6 @@
 
 _DATA = namedtuple("_DATA", "afg,ukr")
 
-from pytest_factoryboy import register
-from testutils.factories import UserFactory
 
 register(UserFactory)