c2cwsgiutils 6.2.0.dev147__tar.gz → 6.2.0.dev152__tar.gz

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/PKG-INFO

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

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/acceptance/utils.py

@@ -43,7 +43,7 @@ def retry_timeout(what: Callable[[], Any], timeout: float = _DEFAULT_TIMEOUT, in
                 return ret
         except NameError:
             raise
-        except Exception as e:  # pylint: disable=broad-exception-caught
+        except Exception as e:  # noqa: BLE001
             error = str(e)
             _LOG.info("  Failed: %s", e)
         if time.perf_counter() > timeout:

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/broadcast/__init__.py

@@ -30,7 +30,7 @@ def includeme(config: pyramid.config.Configurator | None = None) -> None:
 
     Otherwise, fall back to a fake local implementation.
     """
-    global _broadcaster  # pylint: disable=global-statement
+    global _broadcaster  # noqa: PLW0603
     broadcast_prefix = config_utils.env_or_config(
         config,
         _BROADCAST_ENV_KEY,
@@ -53,7 +53,7 @@ def includeme(config: pyramid.config.Configurator | None = None) -> None:
 
 
 def _get(need_init: bool = False) -> interface.BaseBroadcaster:
-    global _broadcaster  # pylint: disable=global-statement
+    global _broadcaster  # noqa: PLW0603
     if _broadcaster is None:
         if need_init:
             _LOG.error("Broadcast functionality used before it is setup")
@@ -63,7 +63,7 @@ def _get(need_init: bool = False) -> interface.BaseBroadcaster:
 
 def cleanup() -> None:
     """Cleanup the broadcaster to force to reinitialize it."""
-    global _broadcaster  # pylint: disable=global-statement
+    global _broadcaster  # noqa: PLW0603
     _broadcaster = None
 
 

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/broadcast/redis.py

@@ -49,7 +49,7 @@ class RedisBroadcaster(interface.BaseBroadcaster):
             data = json.loads(message["data"])
             try:
                 response = callback(**data["params"])
-            except Exception as e:  # pragma: no cover  # pylint: disable=broad-exception-caught
+            except Exception as e:  # noqa: BLE001
                 _LOG.error("Failed handling a broadcast message", exc_info=True)
                 response = {"status": 500, "message": str(e)}
             answer_channel = data.get("answer_channel")

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/db_maintenance_view.py

@@ -62,7 +62,7 @@ def _restore(config: pyramid.config.Configurator) -> None:
             db.FORCE_READONLY = readonly == "true"
     except ImportError:
         pass  # don't have redis
-    except Exception:  # pylint: disable=broad-exception-caught
+    except Exception:  # noqa: BLE001
         # survive an error since crashing now can have bad consequences for the service. :/
         _LOG.error("Cannot restore readonly DB status.", exc_info=True)
 

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/debug/_views.py

@@ -79,7 +79,7 @@ def _dump_memory_diff(request: pyramid.request.Request) -> list[Any]:
     try:
         if request.params.get("no_warmup", "0").lower() in ("1", "true", "on"):
             request.invoke_subrequest(sub_request)
-    except Exception:  # pylint: disable=broad-exception-caught # noqa: S110
+    except Exception:  # noqa: BLE001, S110
         pass
 
     _LOG.debug("checking memory growth for %s", path)

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/health_check.py

@@ -188,7 +188,7 @@ def _get_alembic_version(alembic_ini_path: Path, name: str) -> str:
     ).decode("utf-8")
     out_match = _ALEMBIC_HEAD_RE.match(out)
     if not out_match:
-        raise Exception(  # pylint: disable=broad-exception-raised
+        raise Exception(  # noqa: TRY002
             "Cannot get the alembic HEAD version from: " + out,
         )
     return out_match.group(1)
@@ -324,7 +324,7 @@ class HealthCheck:
                             error_message = (
                                 f"Invalid alembic version (db: {actual_version}, code: {version_})"
                             )
-                            raise Exception(error_message)  # pylint: disable=broad-exception-raised
+                            raise Exception(error_message)  # noqa: TRY002
                 return version_
 
         self._checks.append(
@@ -395,7 +395,7 @@ class HealthCheck:
             def add(name: str, func: Callable[..., Any], *args: Any) -> None:
                 try:
                     result[name] = func(*args)
-                except Exception as e:  # pylint: disable=broad-exception-caught
+                except Exception as e:  # noqa: BLE001
                     result[name] = {"error": str(e)}
 
             if master is not None:
@@ -506,7 +506,7 @@ class HealthCheck:
             if result is not None:
                 results["successes"][name]["result"] = result
             _set_success(check_name=name)
-        except Exception as e:  # pylint: disable=broad-exception-caught
+        except Exception as e:  # noqa: BLE001
             _PROMETHEUS_HEALTH_CHECKS_FAILURE.labels(name=name).set(1)
             _LOG.warning("Health check %s failed", name, exc_info=True)
             failure = {"message": str(e), "timing": time.perf_counter() - start, "level": level}

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/index.py

@@ -108,7 +108,7 @@ def form(url: str | None, *content: str, method: str = "get", target: str = "_bl
 
 def input_(name: str, label: str | None = None, type_: str | None = None, value: str | int = "") -> str:
     """Get an HTML input."""
-    global _ELEM_ID  # pylint: disable=global-statement
+    global _ELEM_ID  # noqa: PLW0603
     id_ = _ELEM_ID
     _ELEM_ID += 1
 

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/logging_view.py

@@ -74,7 +74,7 @@ def _restore_overrides(config: pyramid.config.Configurator) -> None:
             logging.getLogger(name).setLevel(level)
     except ImportError:
         pass  # don't have redis
-    except Exception:  # pylint: disable=broad-exception-caught
+    except Exception:  # noqa: BLE001
         # survive an error there. Logging levels is not business critical...
         _LOG.warning("Cannot restore logging levels", exc_info=True)
 

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/redis_stats.py

@@ -33,7 +33,7 @@ def init(config: pyramid.config.Configurator | None = None) -> None:
 
 def includeme(config: pyramid.config.Configurator | None = None) -> None:
     """Initialize the Redis tracking."""
-    global _ORIG  # pylint: disable=global-statement
+    global _ORIG  # noqa: PLW0603
     if config_utils.env_or_config(
         config,
         "C2C_TRACK_REDIS",
@@ -47,5 +47,5 @@ def includeme(config: pyramid.config.Configurator | None = None) -> None:
             _ORIG = redis.client.Redis.execute_command
             redis.client.Redis.execute_command = _execute_command_patch  # type: ignore[method-assign,assignment]
             _LOG.info("Enabled the redis tracking")
-        except Exception:  # pragma: nocover  # pylint: disable=broad-exception-caught
+        except Exception:  # noqa: BLE001
             _LOG.warning("Cannot enable redis tracking", exc_info=True)

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/redis_utils.py

@@ -32,7 +32,7 @@ _sentinel: redis.sentinel.Sentinel | None = None
 
 def cleanup() -> None:
     """Cleanup the redis connections."""
-    global _master, _slave, _sentinel  # pylint: disable=global-statement
+    global _master, _slave, _sentinel  # noqa: PLW0603
     _master = None
     _slave = None
     _sentinel = None
@@ -52,7 +52,7 @@ def get(
 
 
 def _init(settings: Mapping[str, Any] | None) -> None:
-    global _master, _slave, _sentinel  # pylint: disable=global-statement
+    global _master, _slave, _sentinel  # noqa: PLW0603
     sentinels = c2cwsgiutils.config_utils.env_or_settings(
         settings,
         REDIS_SENTINELS_KEY,
@@ -131,7 +131,7 @@ class PubSubWorkerThread(threading.Thread):
                     _LOG.warning("Redis connection problem")
                 last_was_ok = False
                 time.sleep(0.5)
-            except Exception:  # pylint: disable=broad-exception-caught
+            except Exception:  # noqa: BLE001
                 _LOG.warning("Unexpected error", exc_info=True)
         _LOG.info("Redis subscription worker stopped")
         pubsub.close()

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/request_tracking/__init__.py

@@ -99,7 +99,7 @@ def includeme(config: pyramid.config.Configurator | None = None) -> None:
     Use a X-Request-ID (or other) header to track all the logs related to a request
     including on the sub services.
     """
-    global _ID_HEADERS, _DEFAULT_TIMEOUT  # pylint: disable=global-statement
+    global _ID_HEADERS, _DEFAULT_TIMEOUT  # noqa: PLW0603
     _ID_HEADERS = ["X-Request-ID", "X-Correlation-ID", "Request-ID", "X-Varnish", "X-Amzn-Trace-Id"]
     if config is not None:
         extra_header = config_utils.env_or_config(config, "C2C_REQUEST_ID_HEADER", "c2c.request_id_header")

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/scripts/stats_db.py

@@ -275,7 +275,7 @@ def _do_dtats_db(args: argparse.Namespace) -> None:
         _LOG.info("Process table %s.%s.", schema, table)
         try:
             do_table(session, schema, table, reporter)
-        except Exception as e:  # pylint: disable=broad-exception-caught
+        except Exception as e:  # noqa: BLE001
             _LOG.exception("Process table %s.%s error.", schema, table)
             reporter.error([schema, table], e)
 
@@ -284,7 +284,7 @@ def _do_dtats_db(args: argparse.Namespace) -> None:
             _LOG.info("Process extra %s.", extra)
             try:
                 do_extra(session, extra, "extra", "Extra metric", reporter)
-            except Exception as e:  # pylint: disable=broad-exception-caught
+            except Exception as e:  # noqa: BLE001
                 _LOG.exception("Process extra %s error.", extra)
                 reporter.error(["extra", str(pos + 1)], e)
     if args.extra_gauge:
@@ -293,7 +293,7 @@ def _do_dtats_db(args: argparse.Namespace) -> None:
             _LOG.info("Process extra %s.", extra)
             try:
                 do_extra(session, sql, gauge, gauge_help, reporter)
-            except Exception as e:  # pylint: disable=broad-exception-caught
+            except Exception as e:  # noqa: BLE001
                 _LOG.exception("Process extra %s error.", extra)
                 reporter.error(["extra", str(len(args.extra) + pos + 1)], e)
 

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/sentry.py

@@ -39,7 +39,7 @@ def init(config: pyramid.config.Configurator | None = None) -> None:
 
 def includeme(config: pyramid.config.Configurator | None = None) -> None:
     """Initialize the Sentry integration."""
-    global _CLIENT_SETUP  # pylint: disable=global-statement
+    global _CLIENT_SETUP  # noqa: PLW0603
     sentry_url = config_utils.env_or_config(config, "SENTRY_URL", "c2c.sentry.url")
     if sentry_url is not None and not _CLIENT_SETUP:
         client_info: MutableMapping[str, Any] = {
@@ -184,7 +184,7 @@ def filter_wsgi_app(application: Callable[..., Any]) -> Callable[..., Any]:
         try:
             _LOG.info("Enable WSGI filter for Sentry")
             return SentryWsgiMiddleware(application)
-        except Exception:  # pylint: disable=broad-exception-caught
+        except Exception:  # noqa: BLE001
             _LOG.error("Failed enabling sentry. Continuing without it.", exc_info=True)
             return application
     else:

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/sql_profiler/_impl.py

@@ -57,7 +57,7 @@ class _Repository:
                             ],
                         )
                     _LOG.info(output)
-                except Exception:  # pylint: disable=broad-exception-caught # noqa: S110
+                except Exception:  # noqa: BLE001, S110
                     pass
 
 
@@ -70,7 +70,7 @@ def _sql_profiler_view(request: pyramid.request.Request) -> Mapping[str, Any]:
 
 
 def _setup_profiler(enable: str) -> None:
-    global _REPOSITORY  # pylint: disable=global-statement
+    global _REPOSITORY  # noqa: PLW0603
     if config_utils.config_bool(enable):
         if _REPOSITORY is None:
             _LOG.info("Enabling the SQL profiler")

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/c2cwsgiutils/sqlalchemylogger/handlers.py

@@ -85,7 +85,7 @@ class SQLAlchemyHandler(logging.Handler):
                 self.session.rollback()
                 self.session.bulk_save_objects(logs)
                 self.session.commit()
-            except Exception as e:  # pylint: disable=broad-exception-caught #
+            except Exception as e:  # noqa: BLE001
                 # if we really cannot commit the log to DB, do not lock the
                 # thread and do not crash the application
                 _LOG.critical(e)

{c2cwsgiutils-6.2.0.dev147 → c2cwsgiutils-6.2.0.dev152}/pyproject.toml

@@ -2,9 +2,20 @@
 target-version = "py310"
 line-length = 110
 
+[tool.ruff.lint]
+select = []
+ignore = ["ANN401", "C90", "D100", "D104", "D105", "D107", "D200", "D202", "D207", "D208", "D212", "E501", "EM101", "EM102", "ERA001", "FA", "FBT001", "FBT002", "FIX", "FIX002", "I001", "PERF203", "PLR09", "PLR2004", "Q000", "S101", "S113", "SIM105", "T201", "TD", "TD002", "W293"]
+extend-select = ["UP", "I", "S", "B", "ALL"]
+
 [tool.ruff.lint.pydocstyle]
 convention = "numpy"
 
+[tool.ruff.lint.extend-per-file-ignores]
+"tests/**" = ["ANN", "ARG", "D", "E722", "INP001", "RET", "RUF012", "RUF100", "SLF"]
+"**/tests/**" = ["ANN", "ARG", "D", "E722", "INP001", "RET", "RUF012", "RUF100", "SLF"]
+"**/test_*.py" = ["ANN", "ARG", "D", "E722", "INP001", "RET", "RUF012", "RUF100", "SLF"]
+"**/*_test.py" = ["ANN", "ARG", "D", "E722", "INP001", "RET", "RUF012", "RUF100", "SLF"]
+
 [tool.poetry]
 
 [tool.poetry.plugins."plaster.loader_factory"]
@@ -216,7 +227,7 @@ include = [
 ]
 requires-python = ">=3.10"
 dependencies = ["requests", "pyyaml", "ujson", "cee_syslog_handler", "prometheus-client"]
-version = "6.2.0.dev147"
+version = "6.2.0.dev152"
 
 [project.urls]
 repository = "https://github.com/camptocamp/c2cwsgiutils"