From 2c29d5660106346873e1c9ea0c924b2be848481f Mon Sep 17 00:00:00 2001 From: "reportportal.io" Date: Wed, 20 Mar 2024 13:50:59 +0000 Subject: [PATCH 1/5] Changelog update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35ce4b8..6106ba6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## [Unreleased] + +## [5.5.3] ### Added - Issue [#178](https://github.com/reportportal/agent-Python-RobotFramework/issues/178) Metadata attributes handling, by @HardNorth ### Changed From bbceeb50b54ae085e74fa9fde13101c331301a77 Mon Sep 17 00:00:00 2001 From: "reportportal.io" Date: Wed, 20 Mar 2024 13:51:00 +0000 Subject: [PATCH 2/5] Version update --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 865cb4e..c384fc5 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ from setuptools import setup -__version__ = '5.5.3' +__version__ = '5.5.4' def read_file(fname): From 4aef2c0a99c3c0d256cf0967b961c061ef26cfd6 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 5 Sep 2024 14:11:41 +0300 Subject: [PATCH 3/5] Add Python 3.12 to builders --- .github/workflows/tests.yml | 2 +- setup.py | 1 + tox.ini | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index becc28f..11a271d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,7 +34,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11' ] + python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12' ] steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/setup.py b/setup.py index c384fc5..802f7ec 100644 --- a/setup.py +++ b/setup.py @@ -54,6 +54,7 @@ def read_file(fname): 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', ], install_requires=read_file('requirements.txt').splitlines(), entry_points={ diff --git a/tox.ini b/tox.ini index 6b18893..08b1aa5 100644 --- a/tox.ini +++ b/tox.ini @@ -7,6 +7,7 @@ envlist = py39 py310 py311 + py311 [testenv] deps = @@ -30,3 +31,4 @@ python = 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 From 0788472e66570318b2081a26d2e642c97e24b3ca Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Fri, 6 Sep 2024 16:04:30 +0300 Subject: [PATCH 4/5] Action version update --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e4291d4..440902b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,7 +63,7 @@ jobs: version-file-extraction-pattern: ${{ env.VERSION_EXTRACT_PATTERN }} - name: Setup git credentials - uses: oleksiyrudenko/gha-git-credentials@v2.1.1 + uses: oleksiyrudenko/gha-git-credentials@v2-latest with: name: 'reportportal.io' email: 'support@reportportal.io' From bb73a4cfaccbfd05c60d14675c66fcbadef01f30 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Fri, 6 Sep 2024 16:25:24 +0300 Subject: [PATCH 5/5] Fixes #187 --- CHANGELOG.md | 4 ++++ requirements.txt | 2 +- robotframework_reportportal/variables.py | 19 ++++++++----------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6106ba6..7267487 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog ## [Unreleased] +### Fixed +- Issue [#187](https://github.com/reportportal/agent-Python-RobotFramework/issues/187): Distutils in the agent, by @HardNorth +### Added +- Python 12 support, by @HardNorth ## [5.5.3] ### Added diff --git a/requirements.txt b/requirements.txt index 83cee74..e6052b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ # Basic dependencies python-dateutil~=2.8.1 -reportportal-client~=5.5.6 +reportportal-client~=5.5.7 robotframework diff --git a/robotframework_reportportal/variables.py b/robotframework_reportportal/variables.py index a12727b..488c101 100644 --- a/robotframework_reportportal/variables.py +++ b/robotframework_reportportal/variables.py @@ -13,12 +13,12 @@ """This module contains model that stores Robot Framework variables.""" -from distutils.util import strtobool from os import path from typing import Optional, Union, Dict, Tuple, Any, List from warnings import warn from reportportal_client import OutputType, ClientType +from reportportal_client.helpers import to_bool from reportportal_client.logs import MAX_LOG_BATCH_PAYLOAD_SIZE from robot.libraries.BuiltIn import BuiltIn, RobotNotRunningError @@ -76,10 +76,9 @@ def __init__(self) -> None: self._pabot_pool_id = None self._pabot_used = None - self.attach_log = bool(strtobool(get_variable( - 'RP_ATTACH_LOG', default='False'))) - self.attach_report = bool(strtobool(get_variable('RP_ATTACH_REPORT', default='False'))) - self.attach_xunit = bool(strtobool(get_variable('RP_ATTACH_XUNIT', default='False'))) + self.attach_log = to_bool(get_variable('RP_ATTACH_LOG', default='False')) + self.attach_report = to_bool(get_variable('RP_ATTACH_REPORT', default='False')) + self.attach_xunit = to_bool(get_variable('RP_ATTACH_XUNIT', default='False')) self.launch_attributes = get_variable('RP_LAUNCH_ATTRIBUTES', default='').split() self.launch_id = get_variable('RP_LAUNCH_UUID') self.launch_doc = get_variable('RP_LAUNCH_DOC') @@ -87,15 +86,13 @@ def __init__(self) -> None: 'RP_LOG_BATCH_SIZE', default='20')) self.mode = get_variable('RP_MODE') self.pool_size = int(get_variable('RP_MAX_POOL_SIZE', default='50')) - self.rerun = bool(strtobool(get_variable( - 'RP_RERUN', default='False'))) + self.rerun = to_bool(get_variable('RP_RERUN', default='False')) self.rerun_of = get_variable('RP_RERUN_OF', default=None) - self.skipped_issue = bool(strtobool(get_variable( - 'RP_SKIPPED_ISSUE', default='True'))) + self.skipped_issue = to_bool(get_variable('RP_SKIPPED_ISSUE', default='True')) self.test_attributes = get_variable('RP_TEST_ATTRIBUTES', default='').split() self.log_batch_payload_size = int(get_variable('RP_LOG_BATCH_PAYLOAD_SIZE', default=str(MAX_LOG_BATCH_PAYLOAD_SIZE))) - self.launch_uuid_print = bool(strtobool(get_variable('RP_LAUNCH_UUID_PRINT', default='False'))) + self.launch_uuid_print = to_bool(get_variable('RP_LAUNCH_UUID_PRINT', default='False')) output_type = get_variable('RP_LAUNCH_UUID_PRINT_OUTPUT') self.launch_uuid_print_output = OutputType[output_type.upper()] if output_type else None client_type = get_variable('RP_CLIENT_TYPE') @@ -169,4 +166,4 @@ def verify_ssl(self) -> Union[bool, str]: verify_ssl = get_variable('RP_VERIFY_SSL', default='True') if path.exists(verify_ssl): return verify_ssl - return bool(strtobool(verify_ssl)) + return to_bool(verify_ssl)