c2cwsgiutils 6.1.7__tar.gz → 6.1.7.dev2__tar.gz

{c2cwsgiutils-6.1.7 → c2cwsgiutils-6.1.7.dev2}/PKG-INFO

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

{c2cwsgiutils-6.1.7 → c2cwsgiutils-6.1.7.dev2}/c2cwsgiutils/acceptance/image.py

@@ -58,7 +58,7 @@ def normalize_image(image: NpNdarrayInt) -> NpNdarrayInt:
     return image
 
 
-def check_image(  # pylint: disable=too-many-locals,too-many-statements
+def check_image(
     result_folder: str,
     image_to_check: NpNdarrayInt,
     expected_filename: str,
@@ -108,13 +108,6 @@ def check_image(  # pylint: disable=too-many-locals,too-many-statements
 
     mask = None
     if mask_filename is not None:
-        background_color = [255, 255, 255]
-        for color in range(3):
-            img_hist, _ = skimage.exposure.histogram(
-                image_to_check[..., color], nbins=256, source_range="dtype"
-            )
-            background_color[color] = np.argmax(img_hist)
-
         mask = skimage.io.imread(mask_filename)
 
         assert mask is not None, "Wrong mask: " + mask_filename
@@ -137,7 +130,7 @@ def check_image(  # pylint: disable=too-many-locals,too-many-statements
         assert (
             mask.shape[0] == image_to_check.shape[0] and mask.shape[1] == image_to_check.shape[1]
         ), f"Mask and image should have the same shape ({mask.shape} != {image_to_check.shape})"
-        image_to_check[mask] = background_color
+        image_to_check[mask] = [255, 255, 255]
 
     if not os.path.exists(result_folder):
         os.makedirs(result_folder)
@@ -155,7 +148,7 @@ def check_image(  # pylint: disable=too-many-locals,too-many-statements
         assert (
             expected.shape[0] == mask.shape[0] and expected.shape[1] == mask.shape[1]
         ), f"Mask and expected image should have the same shape ({mask.shape} != {expected.shape})"
-        expected[mask] = background_color
+        expected[mask] = [255, 255, 255]
 
     assert (
         expected.shape == image_to_check.shape

{c2cwsgiutils-6.1.7 → c2cwsgiutils-6.1.7.dev2}/c2cwsgiutils/prometheus.py

@@ -1,6 +1,5 @@
 """Every thing we needs to have the metrics in Prometheus."""
 
-import logging
 import os
 import re
 from collections.abc import Generator, Iterable
@@ -12,12 +11,10 @@ import prometheus_client.metrics_core
 import prometheus_client.multiprocess
 import prometheus_client.registry
 import pyramid.config
-import redis.exceptions
 
 from c2cwsgiutils import broadcast, redis_utils
 from c2cwsgiutils.debug.utils import dump_memory_maps
 
-_LOG = logging.getLogger(__name__)
 _NUMBER_RE = re.compile(r"^[0-9]+$")
 MULTI_PROCESS_COLLECTOR_BROADCAST_CHANNELS = [
     "c2cwsgiutils_prometheus_collector_gc",
@@ -120,12 +117,9 @@ class MultiProcessCustomCollector(prometheus_client.registry.Collector):
     def collect(self) -> Generator[prometheus_client.core.Metric, None, None]:
         results: list[list[SerializedMetric]] = []
         for channel in MULTI_PROCESS_COLLECTOR_BROADCAST_CHANNELS:
-            try:
-                result = broadcast.broadcast(channel, expect_answers=True)
-                if result is not None:
-                    results.extend(cast(Iterable[list[SerializedMetric]], result))
-            except redis.exceptions.ConnectionError:
-                _LOG.error("Failed to get the metrics from the other processes")
+            result = broadcast.broadcast(channel, expect_answers=True)
+            if result is not None:
+                results.extend(cast(Iterable[list[SerializedMetric]], result))
         return _deserialize_collected_data(results)
 
 

{c2cwsgiutils-6.1.7 → c2cwsgiutils-6.1.7.dev2}/pyproject.toml

@@ -16,7 +16,7 @@ strict = true
 
 [tool.poetry]
 name = "c2cwsgiutils"
-version = "6.1.7"
+version = "6.1.7.dev2"
 description = "Common utilities for Camptocamp WSGI applications"
 readme = "README.md"
 authors = ["Camptocamp <info@camptocamp.com>"]