Skip to content
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Changelog

## [Unreleased]
### Changed
- `aiohttp` version updated to 3.13.4, by @HardNorth
### Removed
- `aenum` dependency, by @HardNorth

## [5.7.1]
### Added
- Attribute key length and number truncation, by @HardNorth
- Binary character replacement in basic text fields, by @HardNorth
Expand Down
13 changes: 6 additions & 7 deletions reportportal_client/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import sys
import warnings
from enum import Enum
from typing import Optional, TypedDict, Union

# noinspection PyUnreachableCode
Expand All @@ -23,8 +24,6 @@
else:
from typing_extensions import Unpack

import aenum # type: ignore

# noinspection PyProtectedMember
from reportportal_client._internal.local import current, set_current
from reportportal_client.aio.client import AsyncRPClient, BatchedRPClient, ThreadedRPClient
Expand All @@ -33,13 +32,13 @@
from reportportal_client.steps import step


class ClientType(aenum.Enum):
class ClientType(Enum):
"""Enum of possible type of ReportPortal clients."""

SYNC = aenum.auto()
ASYNC = aenum.auto()
ASYNC_THREAD = aenum.auto()
ASYNC_BATCHED = aenum.auto()
SYNC = 1
ASYNC = 2
ASYNC_THREAD = 3
ASYNC_BATCHED = 4


class _ClientOptions(TypedDict, total=False):
Expand Down
2 changes: 1 addition & 1 deletion reportportal_client/_internal/aio/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@

import asyncio
import sys
from enum import Enum
from types import TracebackType
from typing import Any, Callable, Coroutine, Optional, Union

from aenum import Enum # type: ignore
from aiohttp import ClientResponse, ClientResponseError
from aiohttp import ClientSession as AioHttpClientSession
from aiohttp import ServerConnectionError
Expand Down
7 changes: 3 additions & 4 deletions reportportal_client/_internal/static/defines.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
# limitations under the License

"""This module provides RP client static objects and variables."""

import aenum as enum
from enum import Enum, IntEnum

from reportportal_client.helpers import ATTRIBUTE_LENGTH_LIMIT as ATTRIBUTE_LIMIT

Expand Down Expand Up @@ -47,7 +46,7 @@ def __nonzero__(self):
__bool__ = __nonzero__ # Python3 support


class ItemStartType(str, enum.Enum):
class ItemStartType(str, Enum):
"""This class defines item type mapping."""

BEFORE_CLASS = "before_class"
Expand All @@ -69,7 +68,7 @@ class ItemStartType(str, enum.Enum):
AFTER_TEST = "after_test"


class Priority(enum.IntEnum):
class Priority(IntEnum):
"""Generic enum for various operations' prioritization."""

PRIORITY_IMMEDIATE = 0x0
Expand Down
8 changes: 4 additions & 4 deletions reportportal_client/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import sys
import warnings
from abc import abstractmethod
from enum import Enum
from os import getenv
from typing import Any, Optional, TextIO, Union

import aenum
from requests.adapters import DEFAULT_RETRIES, HTTPAdapter, Retry

# noinspection PyProtectedMember
Expand Down Expand Up @@ -69,11 +69,11 @@
logger.addHandler(logging.NullHandler())


class OutputType(aenum.Enum):
class OutputType(Enum):
"""Enum of possible print output types."""

STDOUT = aenum.auto()
STDERR = aenum.auto()
STDOUT = 1
STDERR = 2

def get_output(self) -> Optional[TextIO]:
"""Return TextIO based on the current type."""
Expand Down
14 changes: 6 additions & 8 deletions reportportal_client/core/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@
import queue
import threading
import warnings
from enum import Enum
from queue import PriorityQueue
from threading import Thread, current_thread
from typing import Optional, Union

from aenum import Enum, auto, unique

# noinspection PyProtectedMember
from reportportal_client._internal.static.defines import Priority
from reportportal_client.core.rp_requests import HttpRequest
Expand All @@ -33,15 +32,14 @@
THREAD_TIMEOUT: int = 10 # Thread termination / wait timeout in seconds


@unique
class ControlCommand(Enum):
"""This class stores worker control commands."""

CLEAR_QUEUE = auto()
NOP = auto()
REPORT_STATUS = auto()
STOP = auto()
STOP_IMMEDIATE = auto()
CLEAR_QUEUE = 1
NOP = 2
REPORT_STATUS = 3
STOP = 4
STOP_IMMEDIATE = 5

def is_stop_cmd(self) -> bool:
"""Verify if the command is the stop one."""
Expand Down
7 changes: 3 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
aenum==3.1.17
typing-extensions==4.13.2
requests==2.32.5
aiohttp==3.11.18
typing-extensions>=4.13.2, <=4.15.0
requests>=2.32.5, <=2.33.1
aiohttp>=3.13.4, <=3.13.5
certifi==2026.2.25
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from setuptools import find_packages, setup

__version__ = "5.7.1"
__version__ = "5.7.2"

TYPE_STUBS = ["*.pyi"]

Expand Down
Loading