c2cwsgiutils 6.1.5__tar.gz → 6.1.6__tar.gz

{c2cwsgiutils-6.1.5 → c2cwsgiutils-6.1.6}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2024, Camptocamp SA
+Copyright (c) 2015-2025, Camptocamp SA
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

{c2cwsgiutils-6.1.5 → c2cwsgiutils-6.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cwsgiutils
-Version: 6.1.5
+Version: 6.1.6
 Summary: Common utilities for Camptocamp WSGI applications
 Home-page: https://github.com/camptocamp/c2cwsgiutils
 License: BSD-2-Clause

c2cwsgiutils-6.1.6/c2cwsgiutils/loader.py

@@ -0,0 +1,40 @@
+import logging
+from typing import Optional, cast
+
+from plaster_pastedeploy import Loader as BaseLoader
+
+from c2cwsgiutils import get_config_defaults, get_logconfig_dict
+
+_LOG = logging.getLogger(__name__)
+
+
+class Loader(BaseLoader):  # type: ignore
+    """The application loader."""
+
+    def _get_defaults(self, defaults: Optional[dict[str, str]] = None) -> dict[str, str]:
+        d = get_config_defaults()
+        d.update(defaults or {})
+        return cast(dict[str, str], super()._get_defaults(d))
+
+    def __repr__(self) -> str:
+        """Get the object representation."""
+        return f'c2cwsgiutils.loader.Loader(uri="{self.uri}")'
+
+    def setup_logging(self, defaults: Optional[dict[str, str]] = None) -> None:
+        """
+        Set up logging via :func:`logging.config.dictConfig` with value returned from c2cwsgiutils.get_logconfig_dict.
+
+        Defaults are specified for the special ``__file__`` and ``here``
+        variables, similar to PasteDeploy config loading. Extra defaults can
+        optionally be specified as a dict in ``defaults``.
+
+        Arguments:
+        ---------
+        defaults: The defaults that will be used when passed to
+            :func:`logging.config.fileConfig`.
+
+        """
+        if "loggers" in self.get_sections():
+            logging.config.dictConfig(get_logconfig_dict(self.uri.path))
+        else:
+            logging.basicConfig()

{c2cwsgiutils-6.1.5 → c2cwsgiutils-6.1.6}/pyproject.toml

@@ -16,7 +16,7 @@ strict = true
 
 [tool.poetry]
 name = "c2cwsgiutils"
-version = "6.1.5"
+version = "6.1.6"
 description = "Common utilities for Camptocamp WSGI applications"
 readme = "README.md"
 authors = ["Camptocamp <info@camptocamp.com>"]
@@ -88,9 +88,9 @@ SQLAlchemy-Utils = { version = "0.41.2", optional = true }
 "zope.sqlalchemy" = { version = "3.1", optional = true }
 pyjwt = { version = "2.9.0", optional = true }
 requests-oauthlib = { version = "2.0.0", optional = true }
-waitress = "3.0.1"
+waitress = "3.0.2"
 scikit-image = { version = "0.24.0", optional = true }
-prometheus-client = { version = "0.21.0", optional = true}
+prometheus-client = { version = "0.21.1", optional = true}
 pyramid_mako = { version = "1.1.0", optional = true}
 
 [tool.poetry.extras]
@@ -173,16 +173,16 @@ test_images = ["scikit-image"]
 prospector = { extras = ["with_bandit", "with_mypy", "with_pyroma"], version = "1.12.1" }
 prospector-profile-duplicated = "1.6.0"
 prospector-profile-utils = "1.9.1"
-coverage = "7.6.4"
+coverage = "7.6.9"
 junit2html = "31.0.2"
-pytest = "8.3.3"
+pytest = "8.3.4"
 pytest-cov = "5.0.0"
 pytest-html = "4.1.1"
-types-pyyaml = "6.0.12.20240917"
+types-pyyaml = "6.0.12.20241221"
 types-requests = "2.32.0.20241016"
 types-redis = "4.6.0.20241004"
 types-ujson = "5.10.0.20240515"
-types-python-dateutil = "2.9.0.20241003"
+types-python-dateutil = "2.9.0.20241206"
 typing_extensions = "4.12.2"
 
 [build-system]

c2cwsgiutils-6.1.5/c2cwsgiutils/loader.py

@@ -1,21 +0,0 @@
-import logging
-from typing import Optional, cast
-
-from plaster_pastedeploy import Loader as BaseLoader
-
-from c2cwsgiutils import get_config_defaults
-
-_LOG = logging.getLogger(__name__)
-
-
-class Loader(BaseLoader):  # type: ignore
-    """The application loader."""
-
-    def _get_defaults(self, defaults: Optional[dict[str, str]] = None) -> dict[str, str]:
-        d = get_config_defaults()
-        d.update(defaults or {})
-        return cast(dict[str, str], super()._get_defaults(d))
-
-    def __repr__(self) -> str:
-        """Get the object representation."""
-        return f'c2cwsgiutils.loader.Loader(uri="{self.uri}")'