chore: drop Python 3.9, add support for 3.14

Author: fubuloubu

.github/workflows/test.yaml

@@ -63,7 +63,7 @@ jobs:
         strategy:
             matrix:
                 os: [ubuntu-latest, macos-latest]   # eventually add `windows-latest`
-                python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
+                python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
         steps:
         - uses: actions/checkout@v4

ape_ledger/_cli.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING
 
 import click
 from ape.cli.arguments import existing_alias_argument, non_existing_alias_argument
@@ -13,7 +13,7 @@
 from ape_ledger.exceptions import LedgerSigningError
 
 
-def _select_account(hd_path: Union["HDBasePath", str]) -> tuple[str, "HDAccountPath"]:
+def _select_account(hd_path: "HDBasePath | str") -> tuple[str, "HDAccountPath"]:
     # NOTE: Lazy import so CLI help loads faster.
     from ape_ledger.choices import AddressPromptChoice
 

ape_ledger/accounts.py

@@ -1,7 +1,7 @@
 import json
 from collections.abc import Iterator
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import rich
 from ape.api import AccountAPI, AccountContainerAPI, TransactionAPI
@@ -112,7 +112,7 @@ def hdpath(self) -> HDAccountPath:
     def account_file(self) -> dict:
         return json.loads(self.account_file_path.read_text())
 
-    def sign_message(self, msg: Any, **signer_options) -> Optional[MessageSignature]:
+    def sign_message(self, msg: Any, **signer_options) -> MessageSignature | None:
         use_eip712_package = isinstance(msg, EIP712Message)
         use_eip712 = use_eip712_package
         if isinstance(msg, str):
@@ -174,7 +174,7 @@ def sign_message(self, msg: Any, **signer_options) -> Optional[MessageSignature]
         v, r, s = signed_msg
         return MessageSignature(v=v, r=HexBytes(r), s=HexBytes(s))
 
-    def sign_transaction(self, txn: TransactionAPI, **kwargs) -> Optional[TransactionAPI]:
+    def sign_transaction(self, txn: TransactionAPI, **kwargs) -> TransactionAPI | None:
         txn.chain_id = 1
         txn_dict: dict = {
             "nonce": txn.nonce,

ape_ledger/choices.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import TYPE_CHECKING, Any
 
 import click
 from ape.cli import PromptChoice
@@ -19,7 +19,7 @@ class AddressPromptChoice(PromptChoice):
 
     def __init__(
         self,
-        hd_path: Union["HDBasePath", str],
+        hd_path: "HDBasePath | str",
         index_offset: int = 0,
         page_size: int = DEFAULT_PAGE_SIZE,
     ):
@@ -31,7 +31,7 @@ def __init__(
         self._hd_root_path = hd_path
         self._index_offset = index_offset
         self._page_size = page_size
-        self._choice_index: Optional[int] = None
+        self._choice_index: int | None = None
 
         # Must call ``_load_choices()`` to set address choices
         super().__init__([])
@@ -48,9 +48,7 @@ def _prompt_message(self) -> str:
             f"or type 'n' for the next {self._page_size} entries"
         )
 
-    def convert(
-        self, value: Any, param: Optional["Parameter"], ctx: Optional["Context"]
-    ) -> Optional[str]:
+    def convert(self, value: Any, param: "Parameter | None", ctx: "Context | None") -> str | None:
         """Convert the user selection to a choice or increment /decrement
         if they input ``n`` or ``p``."""
         if self._page_from_choice(value):

ape_ledger/hdpath.py

@@ -1,5 +1,4 @@
 import struct
-from typing import Optional, Union
 
 
 class HDPath:
@@ -9,7 +8,7 @@ class HDPath:
     as well as the derivation HD path class :class:`~ape_ledger.hdpath.HDBasePath`.
     """
 
-    def __init__(self, path: Union[str, "HDBasePath"]):
+    def __init__(self, path: "HDBasePath | str"):
         if not isinstance(path, str) and hasattr(path, "path"):
             # NOTE: Using getattr for mypy
             path_str = getattr(path, "path")
@@ -71,7 +70,7 @@ class HDBasePath(HDPath):
     :class:`~ape_ledger.hdpath.HDAccountPath`.
     """
 
-    def __init__(self, base_path: Optional[Union[str, "HDBasePath"]] = None):
+    def __init__(self, base_path: "HDBasePath | str | None" = None):
         base_path = base_path or "m/44'/60'/{x}'/0/0"
         if not isinstance(base_path, str) and hasattr(base_path, "path"):
             base_path_str = base_path.path

setup.py

@@ -79,7 +79,7 @@
             "ape_ledger=ape_ledger._cli:cli",
         ],
     },
-    python_requires=">=3.9,<4",
+    python_requires=">=3.10,<4",
     extras_require=extras_require,
     py_modules=["ape_ledger"],
     license="Apache-2.0",
@@ -95,10 +95,10 @@
         "Operating System :: MacOS",
         "Operating System :: POSIX",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
     ],
 )

tests/test_accounts.py

@@ -1,5 +1,5 @@
 import json
-from typing import TYPE_CHECKING, Optional, cast
+from typing import TYPE_CHECKING, cast
 
 import pytest
 from ape import networks
@@ -46,7 +46,7 @@ class Mail(EIP712Message):
 
 
 def build_transaction(
-    txn: "TransactionAPI", receiver: Optional["AddressType"] = None
+    txn: "TransactionAPI", receiver: "AddressType | None" = None
 ) -> "TransactionAPI":
     txn.chain_id = 579875
     txn.nonce = 0
@@ -64,7 +64,7 @@ def build_transaction(
 
 
 def create_static_fee_txn(
-    receiver: Optional["AddressType"] = None,
+    receiver: "AddressType | None" = None,
 ) -> StaticFeeTransaction:
     txn = StaticFeeTransaction()
     txn = cast(StaticFeeTransaction, build_transaction(txn, receiver=receiver))
@@ -73,7 +73,7 @@ def create_static_fee_txn(
 
 
 def create_dynamic_fee_txn(
-    receiver: Optional["AddressType"] = None,
+    receiver: "AddressType | None" = None,
 ) -> DynamicFeeTransaction:
     txn = DynamicFeeTransaction()
     txn = cast(DynamicFeeTransaction, build_transaction(txn, receiver=receiver))