From d0b4dabff7378c6e5bc327ea844d46c464029590 Mon Sep 17 00:00:00 2001 From: pacrob <5199899+pacrob@users.noreply.github.com> Date: Wed, 29 Jan 2025 11:19:00 -0700 Subject: [PATCH] bump keyfile and abi versions, fix new lint errors --- eth_account/account.py | 4 ++-- newsfragments/305.breaking.rst | 1 + setup.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 newsfragments/305.breaking.rst diff --git a/eth_account/account.py b/eth_account/account.py index aa3fd0a4..c81f62ff 100644 --- a/eth_account/account.py +++ b/eth_account/account.py @@ -200,7 +200,7 @@ def decrypt(keyfile_json: Union[str, Dict[str, Any]], password: str) -> HexBytes # type ignored because eth_keyfile appears to be using the wrong type for # the password arg. # once fixed there, this should error and can be removed - return HexBytes(decode_keyfile_json(keyfile, password_bytes)) # type: ignore[arg-type] # noqa: E501 + return HexBytes(decode_keyfile_json(keyfile, password_bytes)) @classmethod def encrypt( @@ -270,7 +270,7 @@ def encrypt( # the password arg. # once fixed there, this should error and can be removed return create_keyfile_json( - key_bytes, password_bytes, kdf=kdf, iterations=iterations # type: ignore[arg-type] # noqa: E501 + key_bytes, password_bytes, kdf=kdf, iterations=iterations ) @combomethod diff --git a/newsfragments/305.breaking.rst b/newsfragments/305.breaking.rst new file mode 100644 index 00000000..d61adbd3 --- /dev/null +++ b/newsfragments/305.breaking.rst @@ -0,0 +1 @@ +Move ``eth-keyfile`` dependency up to ``>=0.9.0`` to account for change in typing there. diff --git a/setup.py b/setup.py index 5144c54d..6b49002b 100644 --- a/setup.py +++ b/setup.py @@ -51,8 +51,8 @@ include_package_data=True, install_requires=[ "bitarray>=2.4.0", - "eth-abi>=4.0.0-b.2", - "eth-keyfile>=0.7.0, <0.9.0", + "eth-abi>=4.0.0", + "eth-keyfile>=0.9.0", "eth-keys>=0.4.0", "eth-rlp>=2.1.0", "eth-utils>=2.0.0",