diff options
author | Alexander Smirnov <alex@ydb.tech> | 2025-04-19 00:51:37 +0000 |
---|---|---|
committer | Alexander Smirnov <alex@ydb.tech> | 2025-04-19 00:51:37 +0000 |
commit | c46f4db13aad94d84f1930f145dc0d4cf79cbf43 (patch) | |
tree | f59e23b072305d922f5836f129bcd0c7dac5fdc9 /contrib/python | |
parent | f73bc5d691a9919f911d7236692c067ef127e9e2 (diff) | |
parent | 605a8a3075d2116bf0c742d7ae889ba14b801a8e (diff) | |
download | ydb-c46f4db13aad94d84f1930f145dc0d4cf79cbf43.tar.gz |
Merge branch 'rightlib' into merge-libs-250419-0050
Diffstat (limited to 'contrib/python')
16 files changed, 64 insertions, 37 deletions
diff --git a/contrib/python/allure-pytest/.dist-info/METADATA b/contrib/python/allure-pytest/.dist-info/METADATA index 475b8580875..069d5d6901e 100644 --- a/contrib/python/allure-pytest/.dist-info/METADATA +++ b/contrib/python/allure-pytest/.dist-info/METADATA @@ -1,6 +1,6 @@ -Metadata-Version: 2.1 +Metadata-Version: 2.4 Name: allure-pytest -Version: 2.13.5 +Version: 2.14.0 Summary: Allure pytest integration Home-page: https://allurereport.org/ Author: Qameta Software Inc., Stanislav Seliverstov @@ -17,15 +17,26 @@ Classifier: Topic :: Software Development :: Quality Assurance Classifier: Topic :: Software Development :: Testing Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3 :: Only -Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: 3.10 Classifier: Programming Language :: Python :: 3.11 Classifier: Programming Language :: Python :: 3.12 +Classifier: Programming Language :: Python :: 3.13 Description-Content-Type: text/markdown -Requires-Dist: pytest >=4.5.0 -Requires-Dist: allure-python-commons ==2.13.5 +Requires-Dist: pytest>=4.5.0 +Requires-Dist: allure-python-commons==2.14.0 +Dynamic: author +Dynamic: author-email +Dynamic: classifier +Dynamic: description +Dynamic: description-content-type +Dynamic: home-page +Dynamic: keywords +Dynamic: license +Dynamic: project-url +Dynamic: requires-dist +Dynamic: summary ## Allure Pytest Plugin diff --git a/contrib/python/allure-pytest/ya.make b/contrib/python/allure-pytest/ya.make index 68c2880e5d2..f3530d05674 100644 --- a/contrib/python/allure-pytest/ya.make +++ b/contrib/python/allure-pytest/ya.make @@ -2,7 +2,7 @@ PY3_LIBRARY() -VERSION(2.13.5) +VERSION(2.14.0) LICENSE(Apache-2.0) diff --git a/contrib/python/allure-python-commons/.dist-info/METADATA b/contrib/python/allure-python-commons/.dist-info/METADATA index 94cd97681a8..b79879133e7 100644 --- a/contrib/python/allure-python-commons/.dist-info/METADATA +++ b/contrib/python/allure-python-commons/.dist-info/METADATA @@ -1,7 +1,7 @@ -Metadata-Version: 2.1 +Metadata-Version: 2.4 Name: allure-python-commons -Version: 2.13.5 -Summary: ('Contains the API for end users as well as helper functions and classes to build Allure adapters for Python test frameworks',) +Version: 2.14.0 +Summary: Contains the API for end users as well as helper functions and classes to build Allure adapters for Python test frameworks Home-page: https://allurereport.org/ Author: Qameta Software Inc., Stanislav Seliverstov Author-email: sseliverstov@qameta.io @@ -15,16 +15,28 @@ Classifier: Topic :: Software Development :: Quality Assurance Classifier: Topic :: Software Development :: Testing Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3 :: Only -Classifier: Programming Language :: Python :: 3.7 Classifier: Programming Language :: Python :: 3.8 Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: 3.10 Classifier: Programming Language :: Python :: 3.11 Classifier: Programming Language :: Python :: 3.12 +Classifier: Programming Language :: Python :: 3.13 Requires-Python: >=3.6 Description-Content-Type: text/markdown -Requires-Dist: attrs >=16.0.0 -Requires-Dist: pluggy >=0.4.0 +Requires-Dist: attrs>=16.0.0 +Requires-Dist: pluggy>=0.4.0 +Dynamic: author +Dynamic: author-email +Dynamic: classifier +Dynamic: description +Dynamic: description-content-type +Dynamic: home-page +Dynamic: keywords +Dynamic: license +Dynamic: project-url +Dynamic: requires-dist +Dynamic: requires-python +Dynamic: summary ## Allure Common API diff --git a/contrib/python/allure-python-commons/allure.py b/contrib/python/allure-python-commons/allure/__init__.py index 4acb83e37a3..c30329a6e8a 100644 --- a/contrib/python/allure-python-commons/allure.py +++ b/contrib/python/allure-python-commons/allure/__init__.py @@ -3,7 +3,7 @@ from allure_commons._allure import description, description_html from allure_commons._allure import label from allure_commons._allure import severity from allure_commons._allure import tag -from allure_commons._allure import id +from allure_commons._allure import id # noqa: A004 from allure_commons._allure import suite, parent_suite, sub_suite from allure_commons._allure import epic, feature, story from allure_commons._allure import link, issue, testcase diff --git a/contrib/python/allure-python-commons/allure/py.typed b/contrib/python/allure-python-commons/allure/py.typed new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/contrib/python/allure-python-commons/allure/py.typed diff --git a/contrib/python/allure-python-commons/allure_commons/_allure.py b/contrib/python/allure-python-commons/allure_commons/_allure.py index 05e01dbd4be..b7bbe2a5e07 100644 --- a/contrib/python/allure-python-commons/allure_commons/_allure.py +++ b/contrib/python/allure-python-commons/allure_commons/_allure.py @@ -1,5 +1,5 @@ from functools import wraps -from typing import Any, Callable, TypeVar +from typing import Any, Callable, TypeVar, Union, overload from allure_commons._core import plugin_manager from allure_commons.types import LabelType, LinkType, ParameterMode @@ -133,7 +133,7 @@ class Dynamic: plugin_manager.hook.add_link(url=url, link_type=link_type, name=name) @staticmethod - def parameter(name, value, excluded=None, mode: ParameterMode = None): + def parameter(name, value, excluded=None, mode: Union[ParameterMode, None] = None): plugin_manager.hook.add_parameter(name=name, value=value, excluded=excluded, mode=mode) @staticmethod @@ -161,6 +161,16 @@ class Dynamic: return Dynamic.label(LabelType.MANUAL, True) +@overload +def step(title: str) -> "StepContext": + ... + + +@overload +def step(title: _TFunc) -> _TFunc: + ... + + def step(title): if callable(title): return StepContext(title.__name__, {})(title) @@ -191,7 +201,7 @@ class StepContext: with StepContext(self.title.format(*args, **params), params): return func(*a, **kw) - return impl + return impl # type: ignore class Attach: diff --git a/contrib/python/allure-python-commons/allure_commons/logger.py b/contrib/python/allure-python-commons/allure_commons/logger.py index d0ac1e2491b..55f956f2507 100644 --- a/contrib/python/allure-python-commons/allure_commons/logger.py +++ b/contrib/python/allure-python-commons/allure_commons/logger.py @@ -15,7 +15,7 @@ class AllureFileLogger: def __init__(self, report_dir, clean=False): self._report_dir = Path(report_dir).absolute() if self._report_dir.is_dir() and clean: - shutil.rmtree(self._report_dir) + shutil.rmtree(self._report_dir, ignore_errors=True) self._report_dir.mkdir(parents=True, exist_ok=True) def _report_item(self, item): diff --git a/contrib/python/allure-python-commons/allure_commons/model2.py b/contrib/python/allure-python-commons/allure_commons/model2.py index e8fd330a0b0..ccaf4459d6a 100644 --- a/contrib/python/allure-python-commons/allure_commons/model2.py +++ b/contrib/python/allure-python-commons/allure_commons/model2.py @@ -53,7 +53,7 @@ class TestResult(ExecutableItem): @attrs class TestStepResult(ExecutableItem): - id = attrib(default=None) + id = attrib(default=None) # noqa: A003 @attrs @@ -82,7 +82,7 @@ class Label: @attrs class Link: - type = attrib(default=None) + type = attrib(default=None) # noqa: A003 url = attrib(default=None) name = attrib(default=None) @@ -99,7 +99,7 @@ class StatusDetails: class Attachment: name = attrib(default=None) source = attrib(default=None) - type = attrib(default=None) + type = attrib(default=None) # noqa: A003 class Status: diff --git a/contrib/python/allure-python-commons/allure_commons/py.typed b/contrib/python/allure-python-commons/allure_commons/py.typed new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/contrib/python/allure-python-commons/allure_commons/py.typed diff --git a/contrib/python/allure-python-commons/allure_commons/types.py b/contrib/python/allure-python-commons/allure_commons/types.py index 06b77dfa151..e631e427c60 100644 --- a/contrib/python/allure-python-commons/allure_commons/types.py +++ b/contrib/python/allure-python-commons/allure_commons/types.py @@ -53,7 +53,7 @@ class AttachmentType(Enum): PNG = ("image/png", "png") JPG = ("image/jpg", "jpg") - SVG = ("image/svg-xml", "svg") + SVG = ("image/svg+xml", "svg") GIF = ("image/gif", "gif") BMP = ("image/bmp", "bmp") TIFF = ("image/tiff", "tiff") diff --git a/contrib/python/allure-python-commons/ya.make b/contrib/python/allure-python-commons/ya.make index 7f3ae9bda73..65be7572db6 100644 --- a/contrib/python/allure-python-commons/ya.make +++ b/contrib/python/allure-python-commons/ya.make @@ -2,7 +2,7 @@ PY3_LIBRARY() -VERSION(2.13.5) +VERSION(2.14.0) LICENSE(Apache-2.0) @@ -15,7 +15,7 @@ NO_LINT() PY_SRCS( TOP_LEVEL - allure.py + allure/__init__.py allure_commons/__init__.py allure_commons/_allure.py allure_commons/_core.py @@ -33,6 +33,8 @@ RESOURCE_FILES( PREFIX contrib/python/allure-python-commons/ .dist-info/METADATA .dist-info/top_level.txt + allure/py.typed + allure_commons/py.typed ) END() diff --git a/contrib/python/argcomplete/py3/.dist-info/METADATA b/contrib/python/argcomplete/py3/.dist-info/METADATA index 8eff29ade2e..c8d45d5d152 100644 --- a/contrib/python/argcomplete/py3/.dist-info/METADATA +++ b/contrib/python/argcomplete/py3/.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.4 Name: argcomplete -Version: 3.6.1 +Version: 3.6.2 Summary: Bash tab completion for argparse Project-URL: Homepage, https://github.com/kislyuk/argcomplete Project-URL: Documentation, https://kislyuk.github.io/argcomplete diff --git a/contrib/python/argcomplete/py3/argcomplete/bash_completion.d/_python-argcomplete b/contrib/python/argcomplete/py3/argcomplete/bash_completion.d/_python-argcomplete index 8a91272dea4..81c9d41f803 100644 --- a/contrib/python/argcomplete/py3/argcomplete/bash_completion.d/_python-argcomplete +++ b/contrib/python/argcomplete/py3/argcomplete/bash_completion.d/_python-argcomplete @@ -124,12 +124,6 @@ __python_argcomplete_which() { _python_argcomplete_global() { if [[ -n "${ZSH_VERSION-}" ]]; then - if [[ "${_matcher_num-}" -gt 1 ]]; then - # Return early if the completer is called multiple times in the same completion run. - # Currently the only known occurrence of this is in zsh when a matcher-list zstyle is declared. - # When this happens, _matcher_num is incremented past 1. - return - fi # Store result of a regex match in the # BASH_REMATCH variable rather than MATCH setopt local_options BASH_REMATCH diff --git a/contrib/python/argcomplete/py3/argcomplete/scripts/activate_global_python_argcomplete.py b/contrib/python/argcomplete/py3/argcomplete/scripts/activate_global_python_argcomplete.py index 299d081c0ea..8e7d27de6cd 100644 --- a/contrib/python/argcomplete/py3/argcomplete/scripts/activate_global_python_argcomplete.py +++ b/contrib/python/argcomplete/py3/argcomplete/scripts/activate_global_python_argcomplete.py @@ -121,10 +121,12 @@ def append_to_config_file(path, shellcode): fh.write(shellcode) print("Added.", file=sys.stderr) + def link_zsh_user_rcfile(zsh_fpath=None): zsh_rcfile = os.path.join(os.path.expanduser(os.environ.get("ZDOTDIR", "~")), ".zshenv") append_to_config_file(zsh_rcfile, zsh_shellcode.format(zsh_fpath=zsh_fpath or get_activator_dir())) + def link_bash_user_rcfile(): bash_completion_user_file = os.path.expanduser("~/.bash_completion") append_to_config_file(bash_completion_user_file, bash_shellcode.format(activator=get_activator_path())) @@ -135,6 +137,7 @@ def link_user_rcfiles(): link_zsh_user_rcfile() link_bash_user_rcfile() + def add_zsh_system_dir_to_fpath_for_user(): if "zsh" not in os.environ.get("SHELL", ""): return @@ -148,6 +151,7 @@ def add_zsh_system_dir_to_fpath_for_user(): except (FileNotFoundError, subprocess.CalledProcessError): pass + def main(): global args args = parser.parse_args() diff --git a/contrib/python/argcomplete/py3/argcomplete/shell_integration.py b/contrib/python/argcomplete/py3/argcomplete/shell_integration.py index cac48902fa7..3d592dc0ab8 100644 --- a/contrib/python/argcomplete/py3/argcomplete/shell_integration.py +++ b/contrib/python/argcomplete/py3/argcomplete/shell_integration.py @@ -34,12 +34,6 @@ _python_argcomplete%(function_suffix)s() { local IFS=$'\013' local script="%(argcomplete_script)s" if [[ -n "${ZSH_VERSION-}" ]]; then - if [[ "${_matcher_num-}" -gt 1 ]]; then - # Return early if the completer is called multiple times in the same completion run. - # Currently the only known occurrence of this is in zsh when a matcher-list zstyle is declared. - # When this happens, _matcher_num is incremented past 1. - return - fi local completions completions=($(IFS="$IFS" \ COMP_LINE="$BUFFER" \ diff --git a/contrib/python/argcomplete/py3/ya.make b/contrib/python/argcomplete/py3/ya.make index 327bc4e34ed..6d1fd084471 100644 --- a/contrib/python/argcomplete/py3/ya.make +++ b/contrib/python/argcomplete/py3/ya.make @@ -2,7 +2,7 @@ PY3_LIBRARY() -VERSION(3.6.1) +VERSION(3.6.2) LICENSE(Apache-2.0) |