c2cwsgiutils 6.2.0.dev77__tar.gz → 6.2.0.dev79__tar.gz

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: c2cwsgiutils
-Version: 6.2.0.dev77
+Version: 6.2.0.dev79
 Summary: Common utilities for Camptocamp WSGI applications
 License: BSD-2-Clause
 Keywords: geo,gis,sqlalchemy,orm,wsgi

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/c2cwsgiutils/auth.py

@@ -59,7 +59,7 @@ class AuthConfig(TypedDict, total=False):
 def get_expected_secret(request: pyramid.request.Request) -> str:
     """Return the secret expected from the client."""
     settings = request.registry.settings
-    return cast(str, env_or_settings(settings, SECRET_ENV, SECRET_PROP, default=False))
+    return cast("str", env_or_settings(settings, SECRET_ENV, SECRET_PROP, default=False))
 
 
 def _hash_secret(secret: str) -> str:
@@ -117,7 +117,7 @@ def _is_auth_user_github(request: pyramid.request.Request) -> tuple[bool, UserDe
     if cookie:
         try:
             return True, cast(
-                UserDetails,
+                "UserDetails",
                 jwt.decode(
                     cookie,
                     env_or_settings(

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/c2cwsgiutils/config_utils.py

@@ -9,7 +9,7 @@ import pyramid.config
 
 def get_base_path(config: pyramid.config.Configurator) -> str:
     """Get the base path of all the views."""
-    return cast(str, env_or_config(config, "C2C_BASE_PATH", "c2c.base_path", "/c2c"))
+    return cast("str", env_or_config(config, "C2C_BASE_PATH", "c2c.base_path", "/c2c"))
 
 
 def env_or_config(

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/c2cwsgiutils/db.py

@@ -236,8 +236,8 @@ class SessionFactory(_sessionmaker):
     def engine_name(self, readwrite: bool) -> str:
         """Get the engine name."""
         if readwrite:
-            return cast(str, self.rw_engine.c2c_name)  # type: ignore[attr-defined]
-        return cast(str, self.ro_engine.c2c_name)  # type: ignore[attr-defined]
+            return cast("str", self.rw_engine.c2c_name)  # type: ignore[attr-defined]
+        return cast("str", self.ro_engine.c2c_name)  # type: ignore[attr-defined]
 
     def __call__(  # type: ignore[override]
         self,

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/c2cwsgiutils/db_maintenance_view.py

@@ -34,7 +34,7 @@ def includeme(config: pyramid.config.Configurator) -> None:
 
 def _db_maintenance(request: pyramid.request.Request) -> Mapping[str, Any]:
     auth.auth_view(request)
-    readonly_param = cast(str, request.params.get("readonly"))
+    readonly_param = cast("str", request.params.get("readonly"))
     if readonly_param is not None:
         readonly = readonly_param.lower() == "true"
 

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/c2cwsgiutils/debug/_listeners.py

@@ -92,7 +92,7 @@ def _dump_memory_impl(
             cache = linecache.cache
             result[analyze_type]["biggest_objects"] = sorted(
                 ({"filename": k, "size_kb": get_size(v)} for k, v in cache.items()),
-                key=lambda i: -(cast(int, i["size_kb"])),
+                key=lambda i: -(cast("int", i["size_kb"])),
             )
         else:
             biggest_objects.reverse()

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/c2cwsgiutils/debug/_views.py

@@ -185,7 +185,7 @@ def _add_view(
 
 def _dump_memory_maps(request: pyramid.request.Request) -> list[dict[str, Any]]:
     auth.auth_view(request)
-    return sorted(dump_memory_maps(), key=lambda i: cast(int, -i.get("pss_kb", 0)))
+    return sorted(dump_memory_maps(), key=lambda i: cast("int", -i.get("pss_kb", 0)))
 
 
 def _show_refs(request: pyramid.request.Request) -> pyramid.response.Response:

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/c2cwsgiutils/health_check.py

@@ -117,7 +117,7 @@ class _OldBinding(_Binding):
         self.prev_bind = None
 
     def name(self) -> str:
-        return cast(str, self.engine.c2c_name)  # type: ignore[attr-defined]
+        return cast("str", self.engine.c2c_name)  # type: ignore[attr-defined]
 
     def __enter__(self) -> _scoped_session:
         self.prev_bind = self.session.bind  # type: ignore[assignment]

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/c2cwsgiutils/index.py

@@ -459,7 +459,7 @@ def _github_login_callback(request: pyramid.request.Request) -> dict[str, Any]:
             "c2c-auth-jwt",
         ),
         jwt.encode(
-            cast(dict[str, Any], user_information),
+            cast("dict[str, Any]", user_information),
             env_or_settings(
                 settings,
                 GITHUB_AUTH_SECRET_ENV,

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/c2cwsgiutils/loader.py

@@ -14,7 +14,7 @@ class Loader(BaseLoader):  # type: ignore[misc]
     def _get_defaults(self, defaults: dict[str, str] | None = None) -> dict[str, str]:
         d = get_config_defaults()
         d.update(defaults or {})
-        return cast(dict[str, str], super()._get_defaults(d))
+        return cast("dict[str, str]", super()._get_defaults(d))
 
     def __repr__(self) -> str:
         """Get the object representation."""

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/c2cwsgiutils/prometheus.py

@@ -3,8 +3,9 @@
 import os
 import re
 import resource
-from collections.abc import Generator, Iterable
-from typing import Any, TypedDict, cast
+from collections.abc import Generator
+from pathlib import Path
+from typing import TYPE_CHECKING, Any, TypedDict, cast
 
 import prometheus_client
 import prometheus_client.core
@@ -16,6 +17,10 @@ import pyramid.config
 from c2cwsgiutils import broadcast, redis_utils
 from c2cwsgiutils.debug.utils import dump_memory_maps
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+
 PSUTILS = True
 try:
     import psutil
@@ -136,7 +141,7 @@ class MultiProcessCustomCollector(prometheus_client.registry.Collector):
         for channel in MULTI_PROCESS_COLLECTOR_BROADCAST_CHANNELS:
             result = broadcast.broadcast(channel, expect_answers=True)
             if result is not None:
-                results.extend(cast(Iterable[list[SerializedMetric]], result))
+                results.extend(cast("Iterable[list[SerializedMetric]]", result))
         return _deserialize_collected_data(results)
 
 
@@ -192,7 +197,9 @@ class MemoryMapCollector(prometheus_client.registry.Collector):
         )
 
         for pid in (
-            [p for p in os.listdir("/proc/") if _NUMBER_RE.match(p)] if self.pids is None else self.pids
+            [p.name for p in Path("/proc/").iterdir() if _NUMBER_RE.match(p.name)]
+            if self.pids is None
+            else self.pids
         ):
             for e in dump_memory_maps(pid):
                 gauge.add_metric([pid, e["name"]], e[self.memory_type + "_kb"] * 1024)

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/c2cwsgiutils/scripts/genversion.py

@@ -23,7 +23,7 @@ def _get_package_version(comp: str) -> tuple[str | None, str | None]:
     src_matcher = _SRC_VERSION_RE.match(comp)
     matcher = src_matcher or _VERSION_RE.match(comp)
     if matcher:
-        return cast(tuple[str, str], matcher.groups())
+        return cast("tuple[str, str]", matcher.groups())
     if len(comp) > 0 and comp[:3] != "-e ":
         print("Cannot parse package version: " + comp)
     return None, None

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/c2cwsgiutils/scripts/stats_db.py

@@ -307,14 +307,14 @@ def main() -> None:
     success = False
     args = _parse_args()
     c2cwsgiutils.setup_process.init(args.config_uri)
-    for _ in range(int(os.environ.get("C2CWSGIUTILS_STATS_DB_TRYNUMBER", 10))):
+    for _ in range(int(os.environ.get("C2CWSGIUTILS_STATS_DB_TRYNUMBER", "10"))):
         try:
             _do_dtats_db(args)
             success = True
             break
         except:  # pylint: disable=bare-except
             _LOG.exception("Exception during run")
-        time.sleep(float(os.environ.get("C2CWSGIUTILS_STATS_DB_SLEEP", 1)))
+        time.sleep(float(os.environ.get("C2CWSGIUTILS_STATS_DB_SLEEP", "1")))
 
     if not success:
         _LOG.error("Not in success, exiting")

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/c2cwsgiutils/setup_process.py

@@ -102,4 +102,4 @@ def bootstrap_application(
     loader = get_config_loader(config_uri)
     loader.setup_logging(options)
     logging.getLogger(__name__).info("Loading the application from %s", config_uri)
-    return cast(PyramidEnv, bootstrap(config_uri, options=options))
+    return cast("PyramidEnv", bootstrap(config_uri, options=options))

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/c2cwsgiutils/version.py

@@ -88,7 +88,7 @@ def _read_versions() -> dict[str, dict[str, str]]:
     """Read the version."""
     with _VERSIONS_PATH.open(encoding="utf-8") as file:
         versions = json.load(file)
-    return cast(dict[str, dict[str, str]], versions)
+    return cast("dict[str, dict[str, str]]", versions)
 
 
 def get_version() -> str | None:

{c2cwsgiutils-6.2.0.dev77 → c2cwsgiutils-6.2.0.dev79}/pyproject.toml

@@ -7,7 +7,7 @@ convention = "numpy"
 
 [tool.poetry]
 name = "c2cwsgiutils"
-version = "6.2.0.dev77"
+version = "6.2.0.dev79"
 description = "Common utilities for Camptocamp WSGI applications"
 readme = "README.md"
 authors = ["Camptocamp <info@camptocamp.com>"]
@@ -187,7 +187,7 @@ test_images = ["scikit-image"]
 
 [tool.poetry.group.dev.dependencies]
 # pylint = { version = "2.15.6" }
-prospector = { version = "1.15.3", extras = ["with_bandit", "with_mypy", "with_pyroma", "with_ruff"] }
+prospector = { version = "1.16.0", extras = ["with_bandit", "with_mypy", "with_pyroma", "with_ruff"] }
 prospector-profile-duplicated = "1.10.5"
 prospector-profile-utils = "1.22.3"
 junit2html = "31.0.2"