Skip to content

Commit c280471

Browse files
committed
Client version update, drop Python 3.7 support
1 parent 5c2b0e1 commit c280471

File tree

7 files changed

+13
-9
lines changed

7 files changed

+13
-9
lines changed

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Set up Python
4242
uses: actions/setup-python@v5
4343
with:
44-
python-version: '3.8'
44+
python-version: '3.10'
4545

4646
- name: Install dependencies
4747
run: python -m pip install --upgrade pip setuptools wheel

.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535
strategy:
3636
matrix:
37-
python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13' ]
37+
python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12', '3.13' ]
3838
steps:
3939
- name: Checkout repository
4040
uses: actions/checkout@v4

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
## [Unreleased]
44
### Added
55
- Support for `Python 3.13`, by @HardNorth
6+
### Removed
7+
- `Python 3.7` support, by @HardNorth
68

79
## [5.5.8]
810
### Added

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Basic dependencies
22
python-dateutil~=2.9.0.post0
3-
reportportal-client~=5.5.10
3+
reportportal-client~=5.6.0
44
robotframework

robotframework_reportportal/listener.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,15 @@ def current_item(self) -> Optional[Union[Keyword, Launch, Suite, Test]]:
184184
return self._items.last()
185185

186186
def __post_skipped_keyword(self, kwd: Keyword) -> None:
187+
self._do_start_keyword(kwd)
187188
skipped_logs = getattr(kwd, 'skipped_logs', [])
188189
for log_message in skipped_logs:
189190
self._log_message(log_message)
190191
skipped_kwds = kwd.skipped_keywords
191192
kwd.skipped_keywords = []
192193
for skipped_kwd in skipped_kwds:
193-
self._do_start_keyword(kwd)
194194
self.__post_skipped_keyword(skipped_kwd)
195-
self._do_end_keyword(kwd)
195+
self._do_end_keyword(kwd)
196196

197197
def _post_skipped_keywords(self, to_post: Optional[Any]) -> None:
198198
if not to_post:
@@ -475,6 +475,11 @@ def end_keyword(self, _: Optional[str], attributes: Dict, ts: Optional[Any] = No
475475
if kwd.status == 'FAIL' and not kwd.posted and kwd.matched_filter is not WKUS_KEYWORD_MATCH:
476476
self._post_skipped_keywords(kwd)
477477

478+
if kwd.matched_filter is WKUS_KEYWORD_MATCH and WKUS_KEYWORD_MATCH.match(kwd):
479+
last_iteration = kwd.skipped_keywords[-1]
480+
self._post_skipped_keywords(last_iteration)
481+
self._do_end_keyword(last_iteration, ts)
482+
478483
self._remove_current_item()
479484
if not kwd.posted:
480485
return

setup.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from setuptools import setup
1919

2020

21-
__version__ = '5.5.9'
21+
__version__ = '5.6.0'
2222

2323

2424
def read_file(fname):
@@ -49,7 +49,6 @@ def read_file(fname):
4949
'agent'],
5050
classifiers=[
5151
'Framework :: Robot Framework',
52-
'Programming Language :: Python :: 3.7',
5352
'Programming Language :: Python :: 3.8',
5453
'Programming Language :: Python :: 3.9',
5554
'Programming Language :: Python :: 3.10',

tox.ini

-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
isolated_build = True
33
envlist =
44
pep
5-
py37
65
py38
76
py39
87
py310
@@ -27,7 +26,6 @@ commands = pre-commit run --all-files --show-diff-on-failure
2726

2827
[gh-actions]
2928
python =
30-
3.7: py37
3129
3.8: py38
3230
3.9: py39
3331
3.10: pep, py310

0 commit comments

Comments
 (0)