dropping 3.9 with EOL (#3)

bump packages and version

Author: doubledare704

.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.9'
+        python-version: '3.10'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -33,7 +33,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.9'
+        python-version: '3.10'
 
     - name: Install build dependencies
       run: |

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11']
+        python-version: ['3.10', '3.11', '3.12']
 
     steps:
     - uses: actions/checkout@v3

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 exclude: ^examples/
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -12,13 +12,13 @@ repos:
     -   id: requirements-txt-fixer
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.10
+    rev: v0.14.1
     hooks:
     -   id: ruff
         args: [--fix, --exit-non-zero-on-fix]
     -   id: ruff-format
 
 -   repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.404
+    rev: v1.1.406
     hooks:
     -   id: pyright

aiowhitebit/__init__.py

@@ -5,4 +5,4 @@
 """
 
 # Version information
-__version__ = "0.3.0"
+__version__ = "0.4.0"

aiowhitebit/clients/base.py

@@ -1,7 +1,8 @@
 """Base client functionality for the WhiteBit API."""
 
 from asyncio import Semaphore
-from typing import Any, Callable, Optional, TypeVar
+from collections.abc import Callable
+from typing import Any, TypeVar
 
 import aiohttp
 
@@ -23,7 +24,7 @@ def __init__(self):
 
         Sets up an empty session and default rate limiter.
         """
-        self._session: Optional[aiohttp.ClientSession] = None
+        self._session: aiohttp.ClientSession | None = None
         self._rate_limiter = Semaphore(100)  # Default rate limit
 
     @property
@@ -97,7 +98,7 @@ def request_url(self, path: str) -> str:
         """
         return f"{self.base_url}{path}"
 
-    async def _make_request(self, path: str, converter: Optional[Callable[[dict], T]] = None) -> T:
+    async def _make_request(self, path: str, converter: Callable[[dict], T] | None = None) -> T:
         full_url = self.request_url(path)
         json_obj = await self.get(full_url)
         return converter(json_obj) if converter else json_obj

aiowhitebit/clients/private/v4.py

@@ -5,7 +5,7 @@
 import hmac
 import json
 import time
-from typing import Callable, Optional, Union
+from collections.abc import Callable
 
 import aiohttp
 from pydantic import BaseModel
@@ -66,8 +66,8 @@ def __init__(
         self.api_key = api_key
         self.secret_key = secret_key
         self.base_url = base_url
-        self.payload: Optional[bytes] = None
-        self.signature: Optional[str] = None
+        self.payload: bytes | None = None
+        self.signature: str | None = None
         self.session = None
 
     def gen_nonce(self) -> str:
@@ -125,8 +125,8 @@ def prepared_headers(self) -> dict:
 
     async def get_trading_balance(
         self,
-        ticker: Optional[str] = None,
-    ) -> Union[TradingBalanceItem, TradingBalanceList]:
+        ticker: str | None = None,
+    ) -> TradingBalanceItem | TradingBalanceList:
         """Get trading balance for all or a specific currency.
 
         Args:
@@ -161,14 +161,14 @@ async def create_base_orders(
         path: str,
         data_model: BaseModel,
         converter: Callable,
-    ) -> Union[
-        CreateOrderResponse,
-        CancelOrderResponse,
-        list[CreateOrderResponse],
-        ExecutedOrdersResponse,
-        ExecutedDealsResponse,
-        ExecutedOrdersByMarketResponse,
-    ]:
+    ) -> (
+        CreateOrderResponse
+        | CancelOrderResponse
+        | list[CreateOrderResponse]
+        | ExecutedOrdersResponse
+        | ExecutedDealsResponse
+        | ExecutedOrdersByMarketResponse
+    ):
         """Base method for creating orders.
 
         Args:

aiowhitebit/clients/public/v1.py

@@ -1,7 +1,5 @@
 """WhiteBit Public API v1 client."""
 
-from typing import Optional
-
 from aiowhitebit.clients.base import BaseClient
 from aiowhitebit.config import APIEndpoints
 from aiowhitebit.converters.public import (
@@ -58,10 +56,10 @@ async def get_single_market(self, market: str) -> MarketSingleResponse:
     async def get_kline_market(
         self,
         market: str,
-        start: Optional[int] = None,
-        end: Optional[int] = None,
-        interval: Optional[str] = None,
-        limit: Optional[int] = None,
+        start: int | None = None,
+        end: int | None = None,
+        interval: str | None = None,
+        limit: int | None = None,
     ) -> Kline:
         """Get kline data for the requested market."""
         validate_market(market)
@@ -102,7 +100,7 @@ async def get_symbols(self) -> Symbols:
         return await self._make_request(APIEndpoints.SYMBOLS_V1, converter=lambda x: Symbols(**x))
 
     @rate_limit(limit=1000, window=10.0)
-    async def get_order_depth(self, market: str, limit: Optional[int] = None) -> OrderDepth:
+    async def get_order_depth(self, market: str, limit: int | None = None) -> OrderDepth:
         """Get order book for the requested market.
 
         Args:
@@ -128,7 +126,7 @@ async def get_order_depth(self, market: str, limit: Optional[int] = None) -> Ord
 
     @rate_limit(limit=1000, window=10.0)
     async def get_trade_history(
-        self, market: str, last_id: Optional[int] = None, limit: Optional[int] = None
+        self, market: str, last_id: int | None = None, limit: int | None = None
     ) -> TradeHistory:
         """Get trade history for the requested market."""
         validate_market(market)

aiowhitebit/clients/public/v4.py

@@ -1,7 +1,5 @@
 """WhiteBit Public API v4 client."""
 
-from typing import Optional, Union
-
 from aiowhitebit.clients.base import BaseClient
 from aiowhitebit.config import APIEndpoints
 from aiowhitebit.converters.public import (
@@ -60,7 +58,7 @@ async def get_maintenance_status(self) -> MaintenanceStatus:
         return await self._make_request(APIEndpoints.MAINTENANCE_STATUS, converter=lambda x: MaintenanceStatus(**x))
 
     @rate_limit(limit=2000, window=10.0)
-    async def get_orderbook(self, market: str, limit: Optional[int] = None, level: Optional[int] = None) -> Orderbook:
+    async def get_orderbook(self, market: str, limit: int | None = None, level: int | None = None) -> Orderbook:
         """Get orderbook for specific market.
 
         Args:
@@ -117,7 +115,7 @@ async def get_depth(self, market: str) -> Depth:
         return await self._make_request(url, converter=lambda x: Depth(**x))
 
     @rate_limit(limit=2000, window=10.0)
-    async def get_recent_trades(self, market: str, trade_type: Optional[str] = None) -> RecentTrades:
+    async def get_recent_trades(self, market: str, trade_type: str | None = None) -> RecentTrades:
         """Get recent trades for specific market.
 
         Args:
@@ -149,7 +147,7 @@ async def get_fee(self) -> FeeResponse:
             FeeResponse: Dictionary mapping currency tickers to their fee information
         """
 
-        def convert_fee_details(details) -> Union[FeeDetails, dict[str, FeeDetails]]:
+        def convert_fee_details(details) -> FeeDetails | dict[str, FeeDetails]:
             if not details:  # Handle empty dictionaries
                 return FeeDetails(min_amount="0", max_amount="0", fixed=None, flex=None)
 

aiowhitebit/clients/webhook/webhook_client.py

@@ -10,7 +10,8 @@
 import hmac
 import json
 import logging
-from typing import Any, Callable, Optional
+from collections.abc import Callable
+from typing import Any
 
 from multidict import CIMultiDictProxy
 
@@ -40,7 +41,7 @@ def __init__(
             "X-TXC-PAYLOAD",
             "X-TXC-SIGNATURE",
         ]
-        self.current_request: Optional[WebhookRequest] = None
+        self.current_request: WebhookRequest | None = None
         self._handlers: dict[str, Callable[[WebhookRequest], Any]] = {}
 
         # Register default handlers

aiowhitebit/clients/websocket/public.py

@@ -2,7 +2,7 @@
 
 import json
 import logging
-from typing import Any, Optional
+from typing import Any
 
 import websockets
 
@@ -23,7 +23,7 @@ def __init__(self, uri: str) -> None:
             uri: WebSocket URI
         """
         self.uri = uri
-        self.connection: Optional[Any] = None
+        self.connection: Any | None = None
 
     async def connect(self):
         """Connect to the WebSocket server.
@@ -69,7 +69,7 @@ class PublicWebSocketClient:
     This client provides methods to interact with the WhiteBit Public WebSocket API.
     """
 
-    def __init__(self, ws: Optional[BaseWebSocketClient] = None) -> None:
+    def __init__(self, ws: BaseWebSocketClient | None = None) -> None:
         """Initialize the WhiteBit Public WebSocket API client.
 
         Args: