From 7131c4d26d24bba7ed0b02b98dbfd006da38e1e3 Mon Sep 17 00:00:00 2001 From: "reportportal.io" Date: Tue, 11 Nov 2025 14:51:00 +0000 Subject: [PATCH 1/6] Changelog update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1187c3e..962c0be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## [Unreleased] + +## [5.5.3] ### Added - OAuth 2.0 Password Grant authentication, by @HardNorth ### Changed From 5a61612bc7e49305b3c93527d60d955a90fd3e4d Mon Sep 17 00:00:00 2001 From: "reportportal.io" Date: Tue, 11 Nov 2025 14:51:01 +0000 Subject: [PATCH 2/6] Version update --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fb8562a..943cab7 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ from setuptools import setup -__version__ = "5.5.3" +__version__ = "5.5.4" def read_file(fname): From 79c464e5bc9d0bf51dd3d678b828ce66b1653371 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Tue, 11 Nov 2025 17:59:42 +0300 Subject: [PATCH 3/6] Return back deprecated `rp_log_batch_payload_size` parameter for sake of backward compatibility --- CHANGELOG.md | 2 ++ pytest_reportportal/config.py | 12 ++++++++++++ pytest_reportportal/plugin.py | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 962c0be..e8ab780 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## [Unreleased] +### Added +- Return back deprecated `rp_log_batch_payload_size` parameter for sake of backward compatibility, by @HardNorth ## [5.5.3] ### Added diff --git a/pytest_reportportal/config.py b/pytest_reportportal/config.py index a16413d..3225de2 100644 --- a/pytest_reportportal/config.py +++ b/pytest_reportportal/config.py @@ -117,6 +117,18 @@ def __init__(self, pytest_config: Config) -> None: self.rp_log_batch_payload_limit = int(batch_payload_size_limit) else: self.rp_log_batch_payload_limit = MAX_LOG_BATCH_PAYLOAD_SIZE + batch_payload_size = self.find_option(pytest_config, "rp_log_batch_payload_size") + if batch_payload_size: + warnings.warn( + "Parameter `rp_log_batch_payload_size` is deprecated since 5.5.4 " + "and will be subject for removing in the next major version. Use `rp_log_batch_payload_limit` argument" + " instead.", + DeprecationWarning, + 2, + ) + if not batch_payload_size_limit: + self.rp_log_batch_payload_limit = int(batch_payload_size) + self.rp_log_level = get_actual_log_level(pytest_config, "rp_log_level") self.rp_log_format = self.find_option(pytest_config, "rp_log_format") self.rp_thread_logging = to_bool(self.find_option(pytest_config, "rp_thread_logging") or False) diff --git a/pytest_reportportal/plugin.py b/pytest_reportportal/plugin.py index f400d33..cf79866 100644 --- a/pytest_reportportal/plugin.py +++ b/pytest_reportportal/plugin.py @@ -598,6 +598,11 @@ def add_shared_option(name, help_str, default=None, action="store"): default=str(MAX_LOG_BATCH_PAYLOAD_SIZE), help="Maximum payload size in bytes of async batch log requests", ) + parser.addini( + "rp_log_batch_payload_size", + default=str(MAX_LOG_BATCH_PAYLOAD_SIZE), + help="DEPRECATED: Maximum payload size in bytes of async batch log requests", + ) parser.addini("rp_ignore_attributes", type="args", help="Ignore specified pytest markers, i.e parametrize") parser.addini( "rp_is_skipped_an_issue", default=True, type="bool", help="Treat skipped tests as required investigation" From 813ba6591e10bc1b33a21149fce713f0eb54e521 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Tue, 11 Nov 2025 18:04:56 +0300 Subject: [PATCH 4/6] Fix tests --- pytest_reportportal/plugin.py | 1 - tests/unit/test_plugin.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pytest_reportportal/plugin.py b/pytest_reportportal/plugin.py index cf79866..ab3150e 100644 --- a/pytest_reportportal/plugin.py +++ b/pytest_reportportal/plugin.py @@ -600,7 +600,6 @@ def add_shared_option(name, help_str, default=None, action="store"): ) parser.addini( "rp_log_batch_payload_size", - default=str(MAX_LOG_BATCH_PAYLOAD_SIZE), help="DEPRECATED: Maximum payload size in bytes of async batch log requests", ) parser.addini("rp_ignore_attributes", type="args", help="Ignore specified pytest markers, i.e parametrize") diff --git a/tests/unit/test_plugin.py b/tests/unit/test_plugin.py index 5d3f745..41d7ac0 100644 --- a/tests/unit/test_plugin.py +++ b/tests/unit/test_plugin.py @@ -258,6 +258,7 @@ def test_pytest_addoption_adds_correct_ini_file_arguments(): "rp_tests_attributes", "rp_log_batch_size", "rp_log_batch_payload_limit", + "rp_log_batch_payload_size", "rp_ignore_attributes", "rp_is_skipped_an_issue", "rp_hierarchy_code", From 6a4193518c4489d19cd0d80a1df7491ddad01a16 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Tue, 11 Nov 2025 18:06:21 +0300 Subject: [PATCH 5/6] Fix tests --- pytest_reportportal/config.py | 11 ++++++----- pytest_reportportal/plugin.py | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pytest_reportportal/config.py b/pytest_reportportal/config.py index 3225de2..2d7a630 100644 --- a/pytest_reportportal/config.py +++ b/pytest_reportportal/config.py @@ -113,10 +113,6 @@ def __init__(self, pytest_config: Config) -> None: self.rp_launch_description = self.find_option(pytest_config, "rp_launch_description") self.rp_log_batch_size = int(self.find_option(pytest_config, "rp_log_batch_size")) batch_payload_size_limit = self.find_option(pytest_config, "rp_log_batch_payload_limit") - if batch_payload_size_limit: - self.rp_log_batch_payload_limit = int(batch_payload_size_limit) - else: - self.rp_log_batch_payload_limit = MAX_LOG_BATCH_PAYLOAD_SIZE batch_payload_size = self.find_option(pytest_config, "rp_log_batch_payload_size") if batch_payload_size: warnings.warn( @@ -127,7 +123,12 @@ def __init__(self, pytest_config: Config) -> None: 2, ) if not batch_payload_size_limit: - self.rp_log_batch_payload_limit = int(batch_payload_size) + batch_payload_size_limit = batch_payload_size + + if batch_payload_size_limit: + self.rp_log_batch_payload_limit = int(batch_payload_size_limit) + else: + self.rp_log_batch_payload_limit = MAX_LOG_BATCH_PAYLOAD_SIZE self.rp_log_level = get_actual_log_level(pytest_config, "rp_log_level") self.rp_log_format = self.find_option(pytest_config, "rp_log_format") diff --git a/pytest_reportportal/plugin.py b/pytest_reportportal/plugin.py index ab3150e..a927767 100644 --- a/pytest_reportportal/plugin.py +++ b/pytest_reportportal/plugin.py @@ -595,7 +595,6 @@ def add_shared_option(name, help_str, default=None, action="store"): parser.addini("rp_log_batch_size", default="20", help="Size of batch log requests in async mode") parser.addini( "rp_log_batch_payload_limit", - default=str(MAX_LOG_BATCH_PAYLOAD_SIZE), help="Maximum payload size in bytes of async batch log requests", ) parser.addini( From add7774db928edb3d993299850ec1e820bf04592 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Tue, 11 Nov 2025 18:10:39 +0300 Subject: [PATCH 6/6] Fix flake8 --- pytest_reportportal/plugin.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pytest_reportportal/plugin.py b/pytest_reportportal/plugin.py index a927767..14a46a9 100644 --- a/pytest_reportportal/plugin.py +++ b/pytest_reportportal/plugin.py @@ -27,7 +27,6 @@ from pytest import Item, Session from reportportal_client import RP, RPLogHandler from reportportal_client.errors import ResponseError -from reportportal_client.logs import MAX_LOG_BATCH_PAYLOAD_SIZE from pytest_reportportal import LAUNCH_WAIT_TIMEOUT from pytest_reportportal.config import AgentConfig