df_site 0.1.0__tar.gz → 0.1.1__tar.gz

{df_site-0.1.0 → df_site-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: df_site
-Version: 0.1.0
+Version: 0.1.1
 Summary: More batteries to Django
 Home-page: https://github.com/d9pouces/df_site
 License: CECILL-B
@@ -28,7 +28,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: df-config (>=1.2.42)
 Requires-Dist: df-websockets (>=1.0.9,<2.0.0)
 Requires-Dist: django (>=5.0)
-Requires-Dist: django-allauth[mfa,socialaccount] (>=64.1.0,<65.0.0)
+Requires-Dist: django-allauth[mfa,socialaccount] (>=65.1.0,<66.0.0)
 Requires-Dist: django-bootstrap5 (>=23.3)
 Requires-Dist: django-ckeditor-5 (>=0.2.13,<0.3.0)
 Requires-Dist: django-cookie-consent (>=0.6.0,<0.7.0)
@@ -44,7 +44,7 @@ Requires-Dist: django-redis-sessions (>=0.6.2,<0.7.0)
 Requires-Dist: django-tinymce (>=4.1.0,<5.0.0)
 Requires-Dist: fido2 (>=1.1.3,<2.0.0)
 Requires-Dist: jsmin (>=3.0.1,<4.0.0)
-Requires-Dist: lxml-html-clean (>=0.2.2,<0.3.0)
+Requires-Dist: lxml-html-clean (>=0.3.1,<0.4.0)
 Requires-Dist: nh3 (>=0.2.18,<0.3.0)
 Requires-Dist: psycopg (>=3.2.1,<4.0.0)
 Requires-Dist: redis (>=5.0.1,<6.0.0)

{df_site-0.1.0 → df_site-0.1.1}/df_site/admin.py

@@ -2,10 +2,22 @@
 
 from functools import cached_property
 
-from allauth.account.models import EmailAddress
-from allauth.mfa.models import Authenticator
-from allauth.socialaccount.models import SocialAccount
-from allauth.usersessions.models import UserSession
+try:
+    from allauth.account.models import EmailAddress
+except ImportError:
+    EmailAddress = None
+try:
+    from allauth.mfa.models import Authenticator
+except ImportError:
+    Authenticator = None
+try:
+    from allauth.socialaccount.models import SocialAccount
+except ImportError:
+    SocialAccount = None
+try:
+    from allauth.usersessions.models import UserSession
+except ImportError:
+    UserSession = None
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
@@ -111,13 +123,13 @@ class PreferencesUserAdmin(UserAdmin):
     def excluded_inlines(self):
         """Exclude inlines of which the corresponding app is not installed."""
         excluded = []
-        if "allauth.mfa" not in settings.INSTALLED_APPS:
+        if "allauth.mfa" not in settings.INSTALLED_APPS or Authenticator is None:
             excluded.append(AuthenticatorInline)
-        if "allauth.socialaccount" not in settings.INSTALLED_APPS:
+        if "allauth.socialaccount" not in settings.INSTALLED_APPS or SocialAccount is None:
             excluded.append(SocialAccountInline)
-        if "allauth.usersessions" not in settings.INSTALLED_APPS:
+        if "allauth.usersessions" not in settings.INSTALLED_APPS or UserSession is None:
             excluded.append(UserSessionInline)
-        if "allauth.account" not in settings.INSTALLED_APPS:
+        if "allauth.account" not in settings.INSTALLED_APPS or EmailAddress is None:
             excluded.append(EmailAddressInline)
         return excluded
 

{df_site-0.1.0 → df_site-0.1.1}/pyproject.toml

@@ -28,13 +28,13 @@ name = "df_site"
 packages = [{include = "df_site"}]
 readme = "README.md"
 repository = 'https://github.com/d9pouces/df_site'
-version = "0.1.0"
+version = "0.1.1"
 
 [tool.poetry.dependencies]
 df-config = ">=1.2.42"
 df-websockets = "^1.0.9"
 django = ">=5.0"
-django-allauth = {extras = ["mfa", "socialaccount"], version = "^64.1.0"}
+django-allauth = {extras = ["mfa", "socialaccount"], version = "^65.1.0"}
 django-bootstrap5 = ">=23.3"
 django-ckeditor-5 = "^0.2.13"
 django-cookie-consent = "^0.6.0"
@@ -50,7 +50,7 @@ django-redis-sessions = "^0.6.2"
 django-tinymce = "^4.1.0"
 fido2 = "^1.1.3"
 jsmin = "^3.0.1"
-lxml-html-clean = "^0.2.2"
+lxml-html-clean = "^0.3.1"
 nh3 = "^0.2.18"
 psycopg = "^3.2.1"
 python = "^3.10"