Merge branch 'rightlib' into mergelibs-240417-0847

20 files changed, 61 insertions, 52 deletions

diff --git a/contrib/python/clickhouse-connect/.dist-info/METADATA b/contrib/python/clickhouse-connect/.dist-info/METADATA
index 093e1bf5ed5..914107f75a4 100644
--- a/contrib/python/clickhouse-connect/.dist-info/METADATA
+++ b/contrib/python/clickhouse-connect/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clickhouse-connect
-Version: 0.7.5
+Version: 0.7.6
 Summary: ClickHouse Database Core Driver for Python, Pandas, and Superset
 Home-page: https://github.com/ClickHouse/clickhouse-connect
 Author: ClickHouse Inc.
diff --git a/contrib/python/clickhouse-connect/clickhouse_connect/__version__.py b/contrib/python/clickhouse-connect/clickhouse_connect/__version__.py
index c584cf2c459..4a603d90096 100644
--- a/contrib/python/clickhouse-connect/clickhouse_connect/__version__.py
+++ b/contrib/python/clickhouse-connect/clickhouse_connect/__version__.py
@@ -1 +1 @@
-version = '0.7.5'
+version = '0.7.6'
diff --git a/contrib/python/clickhouse-connect/clickhouse_connect/cc_sqlalchemy/datatypes/sqltypes.py b/contrib/python/clickhouse-connect/clickhouse_connect/cc_sqlalchemy/datatypes/sqltypes.py
index 403ec20ca5d..099edde9a75 100644
--- a/contrib/python/clickhouse-connect/clickhouse_connect/cc_sqlalchemy/datatypes/sqltypes.py
+++ b/contrib/python/clickhouse-connect/clickhouse_connect/cc_sqlalchemy/datatypes/sqltypes.py
@@ -235,7 +235,7 @@ class DateTime64(ChSqlaType, SqlaDateTime):
     def __init__(self, precision: int = None, tz: str = None, type_def: TypeDef = None):
         """
         Date time constructor with precision and timezone parameters if not constructed with TypeDef
-        :param precision:   Usually 3/6/9 for mill/micro/nansecond precision on ClickHouse side
+        :param precision:   Usually 3/6/9 for mill/micro/nanosecond precision on ClickHouse side
         :param tz: Timezone string as defined in pytz
         :param type_def: TypeDef from parse_name function
         """
diff --git a/contrib/python/clickhouse-connect/clickhouse_connect/cc_sqlalchemy/ddl/tableengine.py b/contrib/python/clickhouse-connect/clickhouse_connect/cc_sqlalchemy/ddl/tableengine.py
index 483beaabe2c..2a9e452709c 100644
--- a/contrib/python/clickhouse-connect/clickhouse_connect/cc_sqlalchemy/ddl/tableengine.py
+++ b/contrib/python/clickhouse-connect/clickhouse_connect/cc_sqlalchemy/ddl/tableengine.py
@@ -147,6 +147,10 @@ class MergeTree(TableEngine):
         super().__init__(locals())
 
 
+class SharedMergeTree(MergeTree):
+    pass
+
+
 class SummingMergeTree(MergeTree):
     pass
 
diff --git a/contrib/python/clickhouse-connect/clickhouse_connect/datatypes/registry.py b/contrib/python/clickhouse-connect/clickhouse_connect/datatypes/registry.py
index 3544b3776c0..52d10367876 100644
--- a/contrib/python/clickhouse-connect/clickhouse_connect/datatypes/registry.py
+++ b/contrib/python/clickhouse-connect/clickhouse_connect/datatypes/registry.py
@@ -36,7 +36,7 @@ def parse_name(name: str) -> Tuple[str, str, TypeDef]:
         keys, values = parse_columns(base[5:])
         base = 'Tuple'
     elif base == 'Point':
-        values = ['Float64', 'Float64']
+        values = ('Float64', 'Float64')
     else:
         try:
             base, values, _ = parse_callable(base)
diff --git a/contrib/python/clickhouse-connect/clickhouse_connect/driver/query.py b/contrib/python/clickhouse-connect/clickhouse_connect/driver/query.py
index 235fe5e7def..549dfc37177 100644
--- a/contrib/python/clickhouse-connect/clickhouse_connect/driver/query.py
+++ b/contrib/python/clickhouse-connect/clickhouse_connect/driver/query.py
@@ -339,7 +339,7 @@ class QueryResult(Closable):
 
 
 BS = '\\'
-must_escape = (BS, '\'', '`')
+must_escape = (BS, '\'', '`', '\t', '\n')
 
 
 def quote_identifier(identifier: str):
diff --git a/contrib/python/clickhouse-connect/ya.make b/contrib/python/clickhouse-connect/ya.make
index 6bd170d5afd..9c9ea8d7dfc 100644
--- a/contrib/python/clickhouse-connect/ya.make
+++ b/contrib/python/clickhouse-connect/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(0.7.5)
+VERSION(0.7.6)
 
 LICENSE(Apache-2.0)
 
diff --git a/contrib/python/contourpy/.dist-info/METADATA b/contrib/python/contourpy/.dist-info/METADATA
index ae131f08d66..7078d824562 100644
--- a/contrib/python/contourpy/.dist-info/METADATA
+++ b/contrib/python/contourpy/.dist-info/METADATA
@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: contourpy
-Version: 1.2.0
+Version: 1.2.1
 Summary: Python library for calculating contours of 2D quadrilateral grids
 Author-Email: Ian Thomas <[email protected]>
 License: BSD 3-Clause License
         
-        Copyright (c) 2021-2023, ContourPy Developers.
+        Copyright (c) 2021-2024, ContourPy Developers.
         All rights reserved.
         
         Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@ Project-URL: Changelog, https://contourpy.readthedocs.io/en/latest/changelog.htm
 Project-URL: Documentation, https://contourpy.readthedocs.io
 Project-URL: Repository, https://github.com/contourpy/contourpy
 Requires-Python: >=3.9
-Requires-Dist: numpy<2.0,>=1.20
+Requires-Dist: numpy>=1.20
 Requires-Dist: furo; extra == "docs"
 Requires-Dist: sphinx>=7.2; extra == "docs"
 Requires-Dist: sphinx-copybutton; extra == "docs"
@@ -58,7 +58,7 @@ Requires-Dist: bokeh; extra == "bokeh"
 Requires-Dist: selenium; extra == "bokeh"
 Requires-Dist: contourpy[bokeh,docs]; extra == "mypy"
 Requires-Dist: docutils-stubs; extra == "mypy"
-Requires-Dist: mypy==1.6.1; extra == "mypy"
+Requires-Dist: mypy==1.8.0; extra == "mypy"
 Requires-Dist: types-Pillow; extra == "mypy"
 Requires-Dist: contourpy[test-no-images]; extra == "test"
 Requires-Dist: matplotlib; extra == "test"
diff --git a/contrib/python/contourpy/LICENSE b/contrib/python/contourpy/LICENSE
index 90f83c97ddc..96837bd9ed7 100644
--- a/contrib/python/contourpy/LICENSE
+++ b/contrib/python/contourpy/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2021-2023, ContourPy Developers.
+Copyright (c) 2021-2024, ContourPy Developers.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/contrib/python/contourpy/contourpy/__init__.py b/contrib/python/contourpy/contourpy/__init__.py
index 7b85874c73a..aa6baf93d07 100644
--- a/contrib/python/contourpy/contourpy/__init__.py
+++ b/contrib/python/contourpy/contourpy/__init__.py
@@ -5,8 +5,15 @@ from typing import TYPE_CHECKING
 import numpy as np
 
 from contourpy._contourpy import (
-    ContourGenerator, FillType, LineType, Mpl2005ContourGenerator, Mpl2014ContourGenerator,
-    SerialContourGenerator, ThreadedContourGenerator, ZInterp, max_threads,
+    ContourGenerator,
+    FillType,
+    LineType,
+    Mpl2005ContourGenerator,
+    Mpl2014ContourGenerator,
+    SerialContourGenerator,
+    ThreadedContourGenerator,
+    ZInterp,
+    max_threads,
 )
 from contourpy._version import __version__
 from contourpy.chunk import calc_chunk_sizes
@@ -41,12 +48,12 @@ __all__ = [
 
 
 # Simple mapping of algorithm name to class name.
-_class_lookup: dict[str, type[ContourGenerator]] = dict(
-    mpl2005=Mpl2005ContourGenerator,
-    mpl2014=Mpl2014ContourGenerator,
-    serial=SerialContourGenerator,
-    threaded=ThreadedContourGenerator,
-)
+_class_lookup: dict[str, type[ContourGenerator]] = {
+    "mpl2005": Mpl2005ContourGenerator,
+    "mpl2014": Mpl2014ContourGenerator,
+    "serial": SerialContourGenerator,
+    "threaded": ThreadedContourGenerator,
+}
 
 
 def _remove_z_mask(
@@ -257,6 +264,4 @@ def contour_generator(
         kwargs["thread_count"] = thread_count
 
     # Create contour generator.
-    cont_gen = cls(*args, **kwargs)
-
-    return cont_gen
+    return cls(*args, **kwargs)
diff --git a/contrib/python/contourpy/contourpy/_contourpy.pyi b/contrib/python/contourpy/contourpy/_contourpy.pyi
index 7cbca59023d..077f5f9b597 100644
--- a/contrib/python/contourpy/contourpy/_contourpy.pyi
+++ b/contrib/python/contourpy/contourpy/_contourpy.pyi
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import ClassVar, NoReturn
 
 import numpy as np
@@ -55,7 +53,6 @@ class FillType:
     def __init__(self, value: int) -> None: ...
     def __int__(self) -> int: ...
     def __ne__(self, other: object) -> bool: ...
-    def __repr__(self) -> str: ...
     def __setstate__(self, state: int) -> NoReturn: ...
     @property
     def name(self) -> str: ...
@@ -76,7 +73,6 @@ class LineType:
     def __init__(self, value: int) -> None: ...
     def __int__(self) -> int: ...
     def __ne__(self, other: object) -> bool: ...
-    def __repr__(self) -> str: ...
     def __setstate__(self, state: int) -> NoReturn: ...
     @property
     def name(self) -> str: ...
@@ -94,7 +90,6 @@ class ZInterp:
     def __init__(self, value: int) -> None: ...
     def __int__(self) -> int: ...
     def __ne__(self, other: object) -> bool: ...
-    def __repr__(self) -> str: ...
     def __setstate__(self, state: int) -> NoReturn: ...
     @property
     def name(self) -> str: ...
diff --git a/contrib/python/contourpy/contourpy/_version.py b/contrib/python/contourpy/contourpy/_version.py
index c68196d1cb0..a955fdae12b 100644
--- a/contrib/python/contourpy/contourpy/_version.py
+++ b/contrib/python/contourpy/contourpy/_version.py
@@ -1 +1 @@
-__version__ = "1.2.0"
+__version__ = "1.2.1"
diff --git a/contrib/python/contourpy/contourpy/dechunk.py b/contrib/python/contourpy/contourpy/dechunk.py
index 92b61bba29d..622a1ceb7df 100644
--- a/contrib/python/contourpy/contourpy/dechunk.py
+++ b/contrib/python/contourpy/contourpy/dechunk.py
@@ -4,7 +4,9 @@ from typing import TYPE_CHECKING, cast
 
 from contourpy._contourpy import FillType, LineType
 from contourpy.array import (
-    concat_codes_or_none, concat_offsets_or_none, concat_points_or_none,
+    concat_codes_or_none,
+    concat_offsets_or_none,
+    concat_points_or_none,
     concat_points_or_none_with_nan,
 )
 from contourpy.enum_util import as_fill_type, as_line_type
diff --git a/contrib/python/contourpy/contourpy/typecheck.py b/contrib/python/contourpy/contourpy/typecheck.py
index 06a18f6cb04..23fbd54856a 100644
--- a/contrib/python/contourpy/contourpy/typecheck.py
+++ b/contrib/python/contourpy/contourpy/typecheck.py
@@ -196,7 +196,7 @@ def check_lines(lines: cpy.LineReturn, line_type: LineType | str) -> None:
         if TYPE_CHECKING:
             lines = cast(cpy.LineReturn_ChunkCombinedNan, lines)
         _check_tuple_of_lists_with_same_length(lines, 1, allow_empty_lists=False)
-        for chunk, points_or_none in enumerate(lines[0]):
+        for _chunk, points_or_none in enumerate(lines[0]):
             if points_or_none is not None:
                 check_point_array(points_or_none)
     else:
diff --git a/contrib/python/contourpy/contourpy/util/_build_config.pyi b/contrib/python/contourpy/contourpy/util/_build_config.pyi
index 7ca4b0eb8cd..cedb032d27c 100644
--- a/contrib/python/contourpy/contourpy/util/_build_config.pyi
+++ b/contrib/python/contourpy/contourpy/util/_build_config.pyi
@@ -1,5 +1,3 @@
 # Explicit type hints for dynamically-generated python file that mypy may not be able to find.
 
-from __future__ import annotations
-
 def build_config() -> dict[str, str]: ...
diff --git a/contrib/python/contourpy/contourpy/util/bokeh_renderer.py b/contrib/python/contourpy/contourpy/util/bokeh_renderer.py
index c467fe9f70f..85b0f8c40e8 100644
--- a/contrib/python/contourpy/contourpy/util/bokeh_renderer.py
+++ b/contrib/python/contourpy/contourpy/util/bokeh_renderer.py
@@ -11,7 +11,6 @@ from bokeh.palettes import Category10
 from bokeh.plotting import figure
 import numpy as np
 
-from contourpy import FillType, LineType
 from contourpy.enum_util import as_fill_type, as_line_type
 from contourpy.util.bokeh_util import filled_to_bokeh, lines_to_bokeh
 from contourpy.util.renderer import Renderer
@@ -22,6 +21,7 @@ if TYPE_CHECKING:
     from numpy.typing import ArrayLike
     from selenium.webdriver.remote.webdriver import WebDriver
 
+    from contourpy import FillType, LineType
     from contourpy._contourpy import FillReturn, LineReturn
 
 
@@ -146,21 +146,21 @@ class BokehRenderer(Renderer):
         """
         fig = self._get_figure(ax)
         x, y = self._grid_as_2d(x, y)
-        xs = [row for row in x] + [row for row in x.T]
-        ys = [row for row in y] + [row for row in y.T]
-        kwargs = dict(line_color=color, alpha=alpha)
+        xs = list(x) + list(x.T)
+        ys = list(y) + list(y.T)
+        kwargs = {"line_color": color, "alpha": alpha}
         fig.multi_line(xs, ys, **kwargs)
         if quad_as_tri_alpha > 0:
             # Assumes no quad mask.
             xmid = (0.25*(x[:-1, :-1] + x[1:, :-1] + x[:-1, 1:] + x[1:, 1:])).ravel()
             ymid = (0.25*(y[:-1, :-1] + y[1:, :-1] + y[:-1, 1:] + y[1:, 1:])).ravel()
             fig.multi_line(
-                [row for row in np.stack((x[:-1, :-1].ravel(), xmid, x[1:, 1:].ravel()), axis=1)],
-                [row for row in np.stack((y[:-1, :-1].ravel(), ymid, y[1:, 1:].ravel()), axis=1)],
+                list(np.stack((x[:-1, :-1].ravel(), xmid, x[1:, 1:].ravel()), axis=1)),
+                list(np.stack((y[:-1, :-1].ravel(), ymid, y[1:, 1:].ravel()), axis=1)),
                 **kwargs)
             fig.multi_line(
-                [row for row in np.stack((x[:-1, 1:].ravel(), xmid, x[1:, :-1].ravel()), axis=1)],
-                [row for row in np.stack((y[:-1, 1:].ravel(), ymid, y[1:, :-1].ravel()), axis=1)],
+                list(np.stack((x[:-1, 1:].ravel(), xmid, x[1:, :-1].ravel()), axis=1)),
+                list(np.stack((y[:-1, 1:].ravel(), ymid, y[1:, :-1].ravel()), axis=1)),
                 **kwargs)
         if point_color is not None:
             fig.circle(
@@ -323,7 +323,7 @@ class BokehRenderer(Renderer):
         x, y = self._grid_as_2d(x, y)
         z = np.asarray(z)
         ny, nx = z.shape
-        kwargs = dict(text_color=color, text_align="center", text_baseline="middle")
+        kwargs = {"text_color": color, "text_align": "center", "text_baseline": "middle"}
         for j in range(ny):
             for i in range(nx):
                 fig.add_layout(Label(x=x[j, i], y=y[j, i], text=f"{z[j, i]:{fmt}}", **kwargs))
diff --git a/contrib/python/contourpy/contourpy/util/bokeh_util.py b/contrib/python/contourpy/contourpy/util/bokeh_util.py
index 80b9396ea21..e75eb844536 100644
--- a/contrib/python/contourpy/contourpy/util/bokeh_util.py
+++ b/contrib/python/contourpy/contourpy/util/bokeh_util.py
@@ -9,7 +9,10 @@ from contourpy.dechunk import dechunk_lines
 
 if TYPE_CHECKING:
     from contourpy._contourpy import (
-        CoordinateArray, FillReturn, LineReturn, LineReturn_ChunkCombinedNan,
+        CoordinateArray,
+        FillReturn,
+        LineReturn,
+        LineReturn_ChunkCombinedNan,
     )
 
 
diff --git a/contrib/python/contourpy/contourpy/util/mpl_renderer.py b/contrib/python/contourpy/contourpy/util/mpl_renderer.py
index 2d8997f2ca6..c459e02a923 100644
--- a/contrib/python/contourpy/contourpy/util/mpl_renderer.py
+++ b/contrib/python/contourpy/contourpy/util/mpl_renderer.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
 import io
 from typing import TYPE_CHECKING, Any, cast
 
@@ -15,6 +14,8 @@ from contourpy.util.mpl_util import filled_to_mpl_paths, lines_to_mpl_paths
 from contourpy.util.renderer import Renderer
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
     from matplotlib.axes import Axes
     from matplotlib.figure import Figure
     from numpy.typing import ArrayLike
@@ -49,14 +50,15 @@ class MplRenderer(Renderer):
         gridspec_kw: dict[str, Any] | None = None,
     ) -> None:
         if backend is not None:
-            import matplotlib
-            matplotlib.use(backend)
+            import matplotlib as mpl
+            mpl.use(backend)
 
-        kwargs: dict[str, Any] = dict(figsize=figsize, squeeze=False, sharex=True, sharey=True)
+        kwargs: dict[str, Any] = {"figsize": figsize, "squeeze": False,
+                                  "sharex": True, "sharey": True}
         if gridspec_kw is not None:
             kwargs["gridspec_kw"] = gridspec_kw
         else:
-            kwargs["subplot_kw"] = dict(aspect="equal")
+            kwargs["subplot_kw"] = {"aspect": "equal"}
 
         self._fig, axes = plt.subplots(nrows, ncols, **kwargs)
         self._axes = axes.flatten()
@@ -145,7 +147,7 @@ class MplRenderer(Renderer):
         """
         ax = self._get_ax(ax)
         x, y = self._grid_as_2d(x, y)
-        kwargs: dict[str, Any] = dict(color=color, alpha=alpha)
+        kwargs: dict[str, Any] = {"color": color, "alpha": alpha}
         ax.plot(x, y, x.T, y.T, **kwargs)
         if quad_as_tri_alpha > 0:
             # Assumes no quad mask.
diff --git a/contrib/python/contourpy/src/mpl2014.cpp b/contrib/python/contourpy/src/mpl2014.cpp
index d5012de6fc4..a363fa8768d 100644
--- a/contrib/python/contourpy/src/mpl2014.cpp
+++ b/contrib/python/contourpy/src/mpl2014.cpp
@@ -399,7 +399,8 @@ void Mpl2014ContourGenerator::append_contour_to_vertices_and_codes(
             const ContourLine::Children& children = line.get_children();
             py::ssize_t npoints = static_cast<py::ssize_t>(line.size() + 1);
             for (children_it = children.begin(); children_it != children.end(); ++children_it)
-                 npoints += static_cast<py::ssize_t>((*children_it)->size() + 1);
+                // cppcheck-suppress useStlAlgorithm
+                npoints += static_cast<py::ssize_t>((*children_it)->size() + 1);
 
             py::ssize_t vertices_dims[2] = {npoints, 2};
             PointArray vertices(vertices_dims);
@@ -642,8 +643,7 @@ unsigned int Mpl2014ContourGenerator::follow_boundary(
         // Add point to contour.
         get_point_xy(end_point, contour_line);
 
-        if (first_edge)
-            first_edge = false;
+        first_edge = false;
     }
 
     return level_index;
diff --git a/contrib/python/contourpy/ya.make b/contrib/python/contourpy/ya.make
index 1da5a3ee7ca..5c6203a16b1 100644
--- a/contrib/python/contourpy/ya.make
+++ b/contrib/python/contourpy/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(1.2.0)
+VERSION(1.2.1)
 
 LICENSE(BSD-3-Clause)