Merge branch 'reportportal:develop' into restore_rp_display_suite_test_file

Author: ramir-dn

.github/workflows/tests.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12' ]
+        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13' ]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -39,7 +39,7 @@ jobs:
         run: tox
 
       - name: Upload coverage to Codecov
-        if: matrix.python-version == 3.8 && success()
+        if: matrix.python-version == 3.10 && success()
         uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- Support for `Python 3.13`, by @HardNorth
+### Fixed
+- Agent crash if Client could not be initialized, by @HardNorth
+### Changed
+- Client version updated on [5.5.10](https://github.com/reportportal/client-Python/releases/tag/5.5.10), by @HardNorth
 
 ## [5.4.5]
 ### Fixed

pytest_reportportal/rp_logging.py

@@ -18,6 +18,7 @@
 import threading
 from contextlib import contextmanager
 from functools import wraps
+from typing import Any
 
 from reportportal_client import current, set_current
 from reportportal_client import RPLogger
@@ -116,23 +117,22 @@ def patching_logger_class():
     try:
         def wrap_log(original_func):
             @wraps(original_func)
-            def _log(self, *args, **kwargs):
-                attachment = kwargs.pop('attachment', None)
+            def _log(self, *args: list[Any], **kwargs: dict[str, Any]):
+                my_kwargs = kwargs.copy()
+                attachment = my_kwargs.pop('attachment', None)
                 if attachment is not None:
-                    kwargs.setdefault('extra', {}).update(
-                        {'attachment': attachment})
+                    my_kwargs.setdefault('extra', {}).update({'attachment': attachment})
+
                 #  Python 3.11 start catches stack frames in wrappers,
                 #  so add additional stack level skip to not show it
                 if sys.version_info >= (3, 11):
-                    my_kwargs = kwargs.copy()
-                    if 'stacklevel' in kwargs:
+                    if 'stacklevel' in my_kwargs:
                         my_kwargs['stacklevel'] = my_kwargs['stacklevel'] + 1
                     else:
                         my_kwargs['stacklevel'] = 2
                     return original_func(self, *args, **my_kwargs)
                 else:
-                    return original_func(self, *args, **kwargs)
-
+                    return original_func(self, *args, **my_kwargs)
             return _log
 
         def wrap_makeRecord(original_func):

pytest_reportportal/service.py

@@ -24,6 +24,7 @@
 
 from _pytest.doctest import DoctestItem
 from aenum import auto, Enum, unique
+from py.path import local
 from pytest import Class, Function, Module, Package, Item, Session, PytestWarning
 from reportportal_client.aio import Task
 from reportportal_client.core.rp_issues import Issue, ExternalIssue
@@ -167,6 +168,8 @@ def issue_types(self) -> Dict[str, str]:
         project_settings = self.project_settings
         if not isinstance(self.project_settings, dict):
             project_settings = project_settings.blocking_result()
+        if not project_settings:
+            return self._issue_types
         for values in project_settings["subTypes"].values():
             for item in values:
                 self._issue_types[item["shortName"]] = item["locator"]
@@ -210,7 +213,7 @@ def start_launch(self) -> Optional[str]:
         LOGGER.debug('ReportPortal - Launch started: id=%s', self._launch_id)
         return self._launch_id
 
-    def _get_item_dirs(self, item: Item) -> List[str]:
+    def _get_item_dirs(self, item: Item) -> List[local]:
         """
         Get directory of item.
 
@@ -219,8 +222,7 @@ def _get_item_dirs(self, item: Item) -> List[str]:
         """
         root_path = item.session.config.rootdir.strpath
         dir_path = item.fspath.new(basename="")
-        rel_dir = dir_path.new(dirname=dir_path.relto(root_path), basename="",
-                               drive="")
+        rel_dir = dir_path.new(dirname=dir_path.relto(root_path), basename="", drive="")
         return [d for d in rel_dir.parts(reverse=False) if d.basename]
 
     def _get_tree_path(self, item: Item) -> List[Item]:
@@ -874,6 +876,10 @@ def report_fixture(self, name: str, error_msg: str) -> None:
         :param name:       Name of the fixture
         :param error_msg:  Error message
         """
+        if not self.rp:
+            yield
+            return
+
         reporter = self.rp.step_reporter
         item_id = reporter.start_nested_step(name, timestamp())
 
@@ -884,6 +890,7 @@ def report_fixture(self, name: str, error_msg: str) -> None:
             if exception:
                 if type(exception).__name__ != 'Skipped':
                     status = 'FAILED'
+                    self.post_log(name, error_msg, log_level='ERROR')
             reporter.finish_nested_step(item_id, timestamp(), status)
         except Exception as e:
             LOGGER.error('Failed to report fixture: %s', name)

requirements.txt

@@ -1,4 +1,4 @@
 dill>=0.3.6
 pytest>=3.8.0
-reportportal-client~=5.5.9
+reportportal-client~=5.5.10
 aenum>=3.1.0

setup.py

@@ -52,7 +52,8 @@ def read_file(fname):
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: 3.12'
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13'
         ],
     entry_points={
         'pytest11': [

tox.ini

@@ -8,6 +8,7 @@ envlist =
     py310
     py311
     py312
+    py313
 
 [testenv]
 deps =
@@ -27,8 +28,9 @@ commands = pre-commit run --all-files --show-diff-on-failure
 [gh-actions]
 python =
     3.7: py37
-    3.8: pep, py38
+    3.8: py38
     3.9: py39
-    3.10: py310
+    3.10: pep, py310
     3.11: py311
     3.12: py312
+    3.13: py313