Skip to content

Commit

Permalink
Merge pull request #46 from reportportal/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
HardNorth authored Sep 6, 2024
2 parents 727d2d6 + 45ad0a4 commit 69fe135
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 18 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.8'

Expand All @@ -50,7 +50,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'
Expand All @@ -63,7 +63,7 @@ jobs:
git push --tags
- name: Checkout develop branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 'develop'
fetch-depth: 0
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ 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@v3
uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -27,8 +28,9 @@ jobs:

- name: Upload coverage to Codecov
if: matrix.python-version == 3.8 && success()
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: coverage.xml
flags: unittests
name: codecov-client-reportportal
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
# Changelog

## [Unreleased]
### Added
- Python 12 support, by @HardNorth

## [4.0.2]
### Changed
- Improve Scenario Outline parameters reporting, by @nicke46
- Client version updated on [5.5.4](https://github.com/reportportal/client-Python/releases/tag/5.5.4), by @HardNorth

## [4.0.1]
### Added
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ agent-python-behave
:target: https://github.com/reportportal/agent-python-behave
.. image:: https://codecov.io/gh/reportportal/agent-python-behave/branch/master/graph/badge.svg
:target: https://codecov.io/gh/reportportal/agent-python-behave
.. image:: https://slack.epmrpp.reportportal.io/badge.svg
.. image:: https://img.shields.io/badge/slack-join-brightgreen.svg
:target: https://slack.epmrpp.reportportal.io/
:alt: Join Slack chat!
.. image:: https://img.shields.io/badge/reportportal-stackoverflow-orange.svg?style=flat
Expand Down
12 changes: 6 additions & 6 deletions behave_reportportal/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"""Config is structure for configuration of behave ReportPortal agent."""

from configparser import ConfigParser
from distutils.util import strtobool
from enum import Enum
from typing import Optional, List, Union, Tuple
from warnings import warn

from behave.runner import Context
from reportportal_client import OutputType, ClientType
from reportportal_client.helpers import to_bool
from reportportal_client.logs import MAX_LOG_BATCH_PAYLOAD_SIZE

RP_CFG_SECTION = "report_portal"
Expand Down Expand Up @@ -103,10 +103,10 @@ def __init__(
self.launch_attributes = launch_attributes and launch_attributes.split(
" "
)
self.debug_mode = bool(strtobool(str(debug_mode or 'False')))
self.is_skipped_an_issue = bool(strtobool(str(is_skipped_an_issue or 'False')))
self.debug_mode = to_bool(debug_mode or 'False')
self.is_skipped_an_issue = to_bool(is_skipped_an_issue or 'False')
self.retries = retries and int(retries)
self.rerun = bool(strtobool(str(rerun or 'False')))
self.rerun = to_bool(rerun or 'False')
self.rerun_of = rerun_of
self.log_batch_size = (log_batch_size and int(
log_batch_size)) or 20
Expand All @@ -121,7 +121,7 @@ def __init__(
stacklevel=2,
)
self.log_layout = (
LogLayout.STEP if strtobool(step_based) else LogLayout.SCENARIO
LogLayout.STEP if to_bool(step_based) else LogLayout.SCENARIO
)
else:
self.log_layout = LogLayout(log_layout)
Expand All @@ -148,7 +148,7 @@ def __init__(
stacklevel=2
)
self.enabled = all([self.endpoint, self.project, self.api_key])
self.launch_uuid_print = bool(strtobool(launch_uuid_print or 'False'))
self.launch_uuid_print = to_bool(launch_uuid_print or 'False')
self.launch_uuid_print_output = OutputType[launch_uuid_print_output.upper()] \
if launch_uuid_print_output else None
self.client_type = ClientType[client_type.upper()] if client_type else ClientType.SYNC
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
behave==1.2.6
prettytable
reportportal-client~=5.5.3
reportportal-client~=5.5.7
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

from setuptools import setup

__version__ = '4.0.2'
__version__ = '4.0.3'


def read_file(fname):
Expand Down Expand Up @@ -50,6 +50,7 @@ def read_file(fname):
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11'
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
]
)
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ envlist =
py39
py310
py311
py312

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

0 comments on commit 69fe135

Please sign in to comment.