Merge branch 'master' into main-no-binaries

Author: HardNorth

.flake8

@@ -1,4 +1,4 @@
 [flake8]
-ignore = E203, W503, E701
+ignore = E203, W503, E701, E704
 exclude = .git,venv,env
 max-line-length = 119

.github/workflows/release.yml

@@ -50,30 +50,30 @@ jobs:
         with:
           python-version: '3.10'
 
-#      - name: Install dependencies
-#        run: python -m pip install --upgrade pip setuptools wheel
+      - name: Install dependencies
+        run: python -m pip install --upgrade pip setuptools wheel
 
-#      - name: Build package
-#        run: python setup.py sdist bdist_wheel
-#
-#      - name: Publish package
-#        uses: pypa/gh-action-pypi-publish@release/v1
-#        with:
-#          user: ${{ secrets.PYPI_USERNAME }}
-#          password: ${{ secrets.PYPI_PASSWORD }}
+      - name: Build package
+        run: python setup.py sdist bdist_wheel
+
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: ${{ secrets.PYPI_USERNAME }}
+          password: ${{ secrets.PYPI_PASSWORD }}
 
       - name: Setup git credentials
         uses: oleksiyrudenko/gha-git-credentials@v2-latest
         with:
           name: 'reportportal.io'
           email: '[email protected]'
           token: ${{ secrets.GITHUB_TOKEN }}
-#
-#      - name: Tagging new version
-#        id: newVersionTag
-#        run: |
-#          git tag -a ${{ env.RELEASE_VERSION }} -m "Release ${{ env.RELEASE_VERSION }}"
-#          git push --tags
+
+      - name: Tagging new version
+        id: newVersionTag
+        run: |
+          git tag -a ${{ env.RELEASE_VERSION }} -m "Release ${{ env.RELEASE_VERSION }}"
+          git push --tags
 
       - name: Checkout develop branch
         uses: actions/checkout@v4
@@ -108,13 +108,13 @@ jobs:
           version: ${{ env.RELEASE_VERSION }}
           path: ./${{ env.CHANGE_LOG_FILE }}
 
-#      - name: Create Release
-#        id: createRelease
-#        uses: ncipollo/release-action@v1
-#        with:
-#          tag: ${{ env.RELEASE_VERSION }}
-#          name: Release ${{ env.RELEASE_VERSION }}
-#          body: ${{ steps.readChangelogEntry.outputs.changes }}
+      - name: Create Release
+        id: createRelease
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ env.RELEASE_VERSION }}
+          name: Release ${{ env.RELEASE_VERSION }}
+          body: ${{ steps.readChangelogEntry.outputs.changes }}
 
       - name: Update version file
         id: versionFileUpdate

.pre-commit-config.yaml

@@ -1,31 +1,31 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
-    -   id: check-yaml
-    -   id: check-added-large-files
--   repo: https://github.com/PyCQA/pydocstyle
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-added-large-files
+  - repo: https://github.com/PyCQA/pydocstyle
     rev: 6.3.0
     hooks:
-    -   id: pydocstyle
+      - id: pydocstyle
         exclude: |
-            (?x)^(
-                tests/.*
-            )
--   repo: https://github.com/psf/black
+          (?x)^(
+              tests/.*
+          )
+  - repo: https://github.com/psf/black
     rev: 24.10.0
     hooks:
-    -   id: black
-        args: ['reportportal_client', 'tests']
--   repo: https://github.com/pycqa/isort
+      - id: black
+        args: [ '--check', 'reportportal_client', 'tests' ]
+  - repo: https://github.com/pycqa/isort
     rev: 5.13.2
     hooks:
       - id: isort
--   repo: https://github.com/pycqa/flake8
+  - repo: https://github.com/pycqa/flake8
     rev: 7.1.1
     hooks:
-    -   id: flake8
+      - id: flake8

CHANGELOG.md

@@ -1,6 +1,19 @@
 # Changelog
 
 ## [Unreleased]
+### Fixed
+- Issue [#246](https://github.com/reportportal/client-Python/issues/246): Invalid return type, by @HardNorth
+### Changed
+- `helpers.common_helpers.gen_attributes` function now accepts refactored, by @HardNorth
+
+## [5.6.1]
+### Added
+- `markdown_helpers` module in `reportportal_client.helpers` package, by @HardNorth
+### Changed
+- `helpers.is_binary` function to improve binary content detection, by @HardNorth
+- `helpers` module moved to `reportportal_client.helpers` package, by @HardNorth
+
+## [5.6.0]
 ### Added
 - `match_pattern` and `translate_glob_to_regex`, `normalize_caseless`, `caseless_equal` functions in `helpers` module, by @HardNorth
 - `client.RP.start_test_item` method and all its children now accept `uuid` argument, by @HardNorth

reportportal_client/_internal/aio/tasks.py

@@ -19,6 +19,7 @@
 from asyncio import Future
 from typing import Any, Awaitable, Coroutine, Generator, Generic, List, Optional, TypeVar, Union
 
+from reportportal_client._internal.static.defines import NOT_FOUND
 from reportportal_client.aio.tasks import BlockingOperationError, Task
 
 _T = TypeVar("_T")
@@ -54,8 +55,10 @@ def blocking_result(self) -> _T:
         :return: execution result or raise an error, or return immediately if already executed
         """
         if self.done():
-            return self.result()
-        return self.__loop.run_until_complete(self)
+            result = self.result()
+        else:
+            result = self.__loop.run_until_complete(self)
+        return result if result is not NOT_FOUND else None
 
 
 class ThreadedTask(Generic[_T], Task[_T]):
@@ -88,7 +91,8 @@ def blocking_result(self) -> _T:
         :return: execution result or raise an error, or return immediately if already executed
         """
         if self.done():
-            return self.result()
+            result = self.result()
+            return result if result is not NOT_FOUND else None
         if not self.__loop.is_running() or self.__loop.is_closed():
             raise BlockingOperationError("Running loop is not alive")
         start_time = time.time()
@@ -97,7 +101,8 @@ def blocking_result(self) -> _T:
             time.sleep(sleep_time)
         if not self.done():
             raise BlockingOperationError("Timed out waiting for the task execution")
-        return self.result()
+        result = self.result()
+        return result if result is not NOT_FOUND else None
 
 
 class BatchedTaskFactory: