df_site 0.1.4__tar.gz → 0.1.6__tar.gz

{df_site-0.1.4 → df_site-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: df_site
-Version: 0.1.4
+Version: 0.1.6
 Summary: More batteries to Django
 Home-page: https://github.com/d9pouces/df_site
 License: CECILL-B
@@ -22,9 +22,9 @@ Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Dist: df-config (>=1.2.42)
 Requires-Dist: df-websockets (>=1.0.9,<2.0.0)
 Requires-Dist: django (>=5.0)
@@ -34,21 +34,21 @@ Requires-Dist: django-ckeditor-5 (>=0.2.13,<0.3.0)
 Requires-Dist: django-cookie-consent (>=0.6.0,<0.7.0)
 Requires-Dist: django-csp (>=3.7,<4.0)
 Requires-Dist: django-minio-storage (>=0.5.7,<0.6.0)
-Requires-Dist: django-pipeline (>=3.1.0,<4.0.0)
+Requires-Dist: django-pipeline (>=4.0.0,<5.0.0)
 Requires-Dist: django-postman (>=4.5,<5.0)
 Requires-Dist: django-prometheus (>=2.3.1,<3.0.0)
-Requires-Dist: django-prose-editor (>=0.8.0,<0.9.0)
+Requires-Dist: django-prose-editor (>=0.10.2,<0.11.0)
 Requires-Dist: django-recaptcha (>=4.0.0,<5.0.0)
 Requires-Dist: django-redis (>=5.4.0,<6.0.0)
 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.3.1,<0.4.0)
+Requires-Dist: lxml-html-clean (>=0.4.1,<0.5.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)
-Requires-Dist: uvicorn-worker (>=0.2.0,<0.3.0)
+Requires-Dist: redis (>=5.2.0,<6.0.0)
+Requires-Dist: uvicorn-worker (>=0.3.0,<0.4.0)
 Project-URL: Documentation, https://github.com/d9pouces/df_site
 Project-URL: Repository, https://github.com/d9pouces/df_site
 Description-Content-Type: text/markdown

df_site-0.1.6/df_site/dynamic_settings.py

@@ -0,0 +1,42 @@
+"""Python functions to provide Django settings depending on other settings."""
+
+import os
+from typing import Any, Optional
+from urllib.parse import urlparse
+
+
+def allauth_signup_form(values: dict[str, Any]) -> Optional[str]:
+    """Return the form class to use for signing up."""
+    if values.get("RECAPTCHA_PRIVATE_KEY") and values.get("RECAPTCHA_PUBLIC_KEY"):
+        return "df_site.users.forms.ReCaptchaForm"
+    return None
+
+
+allauth_signup_form.required_settings = ["RECAPTCHA_PRIVATE_KEY", "RECAPTCHA_PUBLIC_KEY"]
+
+
+def are_tests_running(values: dict[str, Any]) -> bool:
+    """Return True if we are running unit tests."""
+    return "testserver" in values.get("ALLOWED_HOSTS", [])
+
+
+are_tests_running.required_settings = ["ALLOWED_HOSTS"]
+
+
+def patch_tox_environment(url_variable: str, host_variable: str, port_variable: str):
+    """Patch a single URL for the workaround for https://github.com/tox-dev/tox-docker/issues/55."""
+    if not all(x in os.environ for x in (host_variable, port_variable, url_variable)):
+        return
+    parsed_url = urlparse(os.environ[url_variable])
+    if parsed_url.username or parsed_url.password:
+        netloc = f"{parsed_url.username}:{parsed_url.password}@{os.environ[host_variable]}:{os.environ[port_variable]}"
+    else:
+        netloc = f"{os.environ[host_variable]}:{os.environ[port_variable]}"
+    os.environ[url_variable] = parsed_url._replace(netloc=netloc).geturl()
+
+
+def load_tox_environment():
+    """Is a workaround for https://github.com/tox-dev/tox-docker/issues/55."""
+    patch_tox_environment("REDIS_URL", "REDIS_HOST", "REDIS_6379_TCP_PORT")
+    patch_tox_environment("DATABASE_URL", "POSTGRES_HOST", "POSTGRES_5432_TCP_PORT")
+    patch_tox_environment("MAIN_STORAGE_DIR", "MINIO_HOST", "MINIO_9000_TCP_PORT")

{df_site-0.1.4 → df_site-0.1.6}/df_site/middleware.py

@@ -13,7 +13,7 @@ def websocket_middleware(get_response):
 
         response: HttpResponse = get_response(request)
         # noinspection PyUnresolvedReferences
-        if not request.has_websocket_topics:
+        if hasattr(request, "has_websocket_topics") and not request.has_websocket_topics:
             set_websocket_topics(request)
         return response
 

{df_site-0.1.4 → df_site-0.1.6}/pyproject.toml

@@ -28,7 +28,7 @@ name = "df_site"
 packages = [{include = "df_site"}]
 readme = "README.md"
 repository = 'https://github.com/d9pouces/df_site'
-version = "0.1.4"
+version = "0.1.6"
 
 [tool.poetry.dependencies]
 df-config = ">=1.2.42"
@@ -40,22 +40,22 @@ django-ckeditor-5 = "^0.2.13"
 django-cookie-consent = "^0.6.0"
 django-csp = "^3.7"
 django-minio-storage = "^0.5.7"
-django-pipeline = "^3.1.0"
+django-pipeline = "^4.0.0"
 django-postman = "^4.5"
 django-prometheus = "^2.3.1"
-django-prose-editor = "^0.8.0"
+django-prose-editor = "^0.10.2"
 django-recaptcha = "^4.0.0"
 django-redis = "^5.4.0"
 django-redis-sessions = "^0.6.2"
 django-tinymce = "^4.1.0"
 fido2 = "^1.1.3"
 jsmin = "^3.0.1"
-lxml-html-clean = "^0.3.1"
+lxml-html-clean = "^0.4.1"
 nh3 = "^0.2.18"
 psycopg = "^3.2.1"
 python = "^3.10"
-redis = "^5.0.1"
-uvicorn-worker = "^0.2.0"
+redis = "^5.2.0"
+uvicorn-worker = "^0.3.0"
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.4.2"
@@ -69,6 +69,9 @@ greenlet = "^3.1.1"
 hypothesis = "^6.115.5"
 ipython = "^8.28.0"
 poetry = "^1.7.1"
+pytest = "^8.3.4"
+pytest-django = "^4.9.0"
+pytest-env = "^1.1.5"
 recommonmark = "^0.7.1"
 sphinx = "^8.0.2"
 sphinx-immaterial = "^0.12.2"
@@ -85,6 +88,9 @@ minversion = "6.0"
 required_plugins = "pytest-django"
 testpaths = ["df_site_tests"]
 
+[tool.pytest_env]
+DF_CONF_NAME = "df_site"
+
 [tool.ruff]
 line-length = 120
 

df_site-0.1.4/df_site/dynamic_settings.py

@@ -1,37 +0,0 @@
-"""Python functions to provide Django settings depending on other settings."""
-
-import os
-from typing import Any, Optional
-
-
-def allauth_signup_form(values: dict[str, Any]) -> Optional[str]:
-    """Return the form class to use for signing up."""
-    if values.get("RECAPTCHA_PRIVATE_KEY") and values.get("RECAPTCHA_PUBLIC_KEY"):
-        return "df_site.users.forms.ReCaptchaForm"
-    return None
-
-
-allauth_signup_form.required_settings = ["RECAPTCHA_PRIVATE_KEY", "RECAPTCHA_PUBLIC_KEY"]
-
-
-def are_tests_running(values: dict[str, Any]) -> bool:
-    """Return True if we are running unit tests."""
-    return "testserver" in values.get("ALLOWED_HOSTS", [])
-
-
-are_tests_running.required_settings = ["ALLOWED_HOSTS"]
-
-
-def load_tox_environment():
-    """Is a workaround for https://github.com/tox-dev/tox-docker/issues/55."""
-    if os.environ.get("REDIS_HOST") and os.environ.get("REDIS_6379_TCP_PORT"):
-        os.environ["REDIS_URL"] = f'redis://:p_df_site@{os.environ["REDIS_HOST"]}:{os.environ["REDIS_6379_TCP_PORT"]}/1'
-    if os.environ.get("POSTGRES_HOST") and os.environ.get("POSTGRES_5432_TCP_PORT"):
-        os.environ["DATABASE_URL"] = (
-            f'postgresql://u_df_site:p_df_site@{os.environ["POSTGRES_HOST"]}:'
-            f'{os.environ["POSTGRES_5432_TCP_PORT"]}/d_df_site'
-        )
-    if os.environ.get("MINIO_HOST") and os.environ.get("MINIO_9000_TCP_PORT"):
-        os.environ["MAIN_STORAGE_DIR"] = (
-            f's3:http://u_df_site:p_df_site@127.0.0.1:' f'{os.environ["MINIO_9000_TCP_PORT"]}/f_df_site'
-        )