Version 1.19.0.0

Author: MrNaif2018

.circleci/config.yml

@@ -8,7 +8,7 @@ executors:
     parameters:
       v:
         type: string
-        default: "3.11"
+        default: "3.12"
 
     docker:
       - image: cimg/python:<< parameters.v >>
@@ -105,7 +105,7 @@ jobs:
   deploy:
     executor: bitcart/docker-python
     docker:
-      - image: cimg/python:3.11
+      - image: cimg/python:3.12
     steps:
       - checkout
 
@@ -129,9 +129,9 @@ workflows:
           matrix:
             parameters:
               v:
-                - "3.11"
                 - "3.12"
                 - "3.13"
+                - "3.14"
 
       - bitcart/functional-tests:
           name: functional-tests

.pre-commit-config.yaml

@@ -1,15 +1,15 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-merge-conflict
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.2
+    rev: v0.14.1
     hooks:
       - id: ruff
       - id: ruff-format
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -37,3 +37,7 @@ repos:
         language: node
         require_serial: true
         entry: npx prettier --write --ignore-unknown
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    rev: 0.9.4
+    hooks:
+      - id: uv-lock

.readthedocs.yaml

@@ -3,7 +3,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.11"
+    python: "3.12"
   jobs:
     post_create_environment:
       - pip install uv

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Latest changes
 
+## 1.19.0.0
+
+Require Python 3.12+
+
+Support Python 3.14
+
+Better management of client session closure
+
 ## 1.18.0.0
 
 Electrums upgrade: `add_request` no longer creates a lightning invoice as well, use `add_invoice` as you should have always been doing

bitcart/providers/jsonrpcrequests.py

@@ -1,5 +1,6 @@
 import asyncio
 import contextlib
+import weakref
 from collections.abc import Callable
 from typing import Any
 from urllib.parse import urljoin
@@ -25,6 +26,18 @@ def create_request(method: str, *args: Any, **kwargs: Any) -> dict:
     return request(method, params)  # type: ignore
 
 
+def _cleanup_sessions(sessions: dict[asyncio.AbstractEventLoop, aiohttp.ClientSession]) -> None:
+    loop = get_event_loop()
+    for session in list(sessions.values()):
+        if session is None or session.closed:
+            continue
+        if loop.is_running():
+            loop.create_task(session.close())
+        else:
+            loop.run_until_complete(session.close())
+    sessions.clear()
+
+
 class RPCProxy:
     def __init__(
         self,
@@ -42,13 +55,14 @@ def __init__(
         self.xpub = xpub
         self.proxy = proxy
         self.verify = verify
-        self._connector_class = aiohttp.TCPConnector
+        self._connector_class: type[aiohttp.BaseConnector] = aiohttp.TCPConnector
         self._connector_init: dict[str, Any] = {"ssl": self.verify}
         self._spec = {"exceptions": {"-32600": {"exc_name": "UnauthorizedError", "docstring": "Unauthorized"}}}
         self._spec_valid = False
         self._sessions: dict[asyncio.AbstractEventLoop, aiohttp.ClientSession] = {}
         if session is not None:
             self._sessions[get_event_loop()] = session
+        self._finalizer = weakref.finalize(self, _cleanup_sessions, self._sessions)
 
     @property
     def session(self) -> aiohttp.ClientSession:
@@ -65,7 +79,7 @@ def init_proxy(self) -> None:
             from aiohttp_socks.utils import parse_proxy_url
 
             proxy_type, host, port, username, password = parse_proxy_url(self.proxy)
-            self._connector_class = ProxyConnector  # type: ignore
+            self._connector_class = ProxyConnector
             self._connector_init.update(
                 proxy_type=proxy_type,
                 host=host,
@@ -133,14 +147,6 @@ async def wrapper(*args: Any, **kwargs: Any) -> Any:
 
         return wrapper
 
-    async def _close(self) -> None:
-        for session in self._sessions.values():
-            if session is not None:
-                await session.close()
-
-    def __del__(self) -> None:
-        loop = get_event_loop()
-        if loop.is_running():
-            loop.create_task(self._close())
-        else:
-            loop.run_until_complete(self._close())
+    async def close(self) -> None:
+        if self._finalizer.alive:
+            self._finalizer()

bitcart/version.py

@@ -1 +1 @@
-VERSION = "1.18.0.0"
+VERSION = "1.19.0.0"

pyproject.toml

@@ -9,16 +9,16 @@ description = "Bitcart coins support library"
 readme = "README.md"
 license = "MIT"
 authors = [{ name = "MrNaif2018", email = "chuff184@gmail.com" }]
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "Topic :: Software Development :: Build Tools",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 keywords = ["electrum", "daemon", "bitcart", "bitcartcc"]
 dependencies = ["jsonrpcclient", "aiohttp", "universalasync"]
@@ -61,7 +61,7 @@ packages = ["bitcart"]
 path = "bitcart/version.py"
 
 [tool.ruff]
-target-version = "py311"
+target-version = "py312"
 line-length = 127
 
 [tool.ruff.lint]