Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #196

Merged
merged 5 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: '[email protected]'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# 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
- Issue [#178](https://github.com/reportportal/agent-Python-RobotFramework/issues/178) Metadata attributes handling, by @HardNorth
### Changed
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Basic dependencies
python-dateutil~=2.8.1
reportportal-client~=5.5.6
reportportal-client~=5.5.7
robotframework
19 changes: 8 additions & 11 deletions robotframework_reportportal/variables.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -76,26 +76,23 @@ 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')
self.log_batch_size = int(get_variable(
'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')
Expand Down Expand Up @@ -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)
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from setuptools import setup


__version__ = '5.5.3'
__version__ = '5.5.4'


def read_file(fname):
Expand Down Expand Up @@ -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={
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ envlist =
py39
py310
py311
py311

[testenv]
deps =
Expand All @@ -30,3 +31,4 @@ python =
3.9: py39
3.10: py310
3.11: py311
3.12: py312