Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump keyfile and abi versions, fix new lint errors #310

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bump keyfile and abi versions, fix new lint errors #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions eth_account/account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions newsfragments/305.breaking.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Move ``eth-keyfile`` dependency up to ``>=0.9.0`` to account for change in typing there.
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down