Skip to content

Commit

Permalink
Merge pull request #4 from unparalleled-js/chore/upgrade
Browse files Browse the repository at this point in the history
chore: upgrade
  • Loading branch information
antazoey authored Nov 23, 2022
2 parents e061bbe + bf29e5b commit 8e6255c
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 19 deletions.
11 changes: 6 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,22 @@ repos:
- id: isort

- repo: https://github.com/psf/black
rev: 22.6.0
rev: 22.10.0
hooks:
- id: black
name: black

- repo: https://gitlab.com/pycqa/flake8
rev: 4.0.1
- repo: https://github.com/pycqa/flake8
rev: 5.0.4
hooks:
- id: flake8

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.971
rev: v0.991
hooks:
- id: mypy
additional_dependencies: [types-setuptools]


default_language_version:
python: python3.8
python: python3
4 changes: 2 additions & 2 deletions ape_keyring/_cli/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ def cli():
pass


cli.add_command(account_cli) # type: ignore
cli.add_command(secrets) # type: ignore
cli.add_command(account_cli)
cli.add_command(secrets)
2 changes: 1 addition & 1 deletion ape_keyring/_secrets.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def _extract_env_var_key(self, key: str):


def get_secret_manager(project_path: Path, storage: Optional[SecretStorage] = None):
return SecretManager(project_path, storage or secret_storage) # type: ignore
return SecretManager(project_path, storage or secret_storage)


__all__ = ["get_secret_manager", "Scope", "SecretManager"]
6 changes: 2 additions & 4 deletions ape_keyring/accounts.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from ape.logging import logger
from ape.types import AddressType, MessageSignature, TransactionSignature
from ape.utils import cached_property
from eth_account import Account as EthAccount # type: ignore
from eth_account import Account as EthAccount
from eth_account.messages import SignableMessage
from eth_utils import to_bytes

Expand All @@ -27,9 +27,7 @@ def accounts(self) -> Iterator[AccountAPI]:
yield self.load(alias)

def load(self, alias: str) -> "KeyringAccount":
return KeyringAccount(
storage=self.storage, storage_key=alias, container=self
) # type: ignore
return KeyringAccount(storage=self.storage, storage_key=alias, container=self)

def __len__(self) -> int:
return len([a for a in self.aliases if a])
Expand Down
2 changes: 1 addition & 1 deletion ape_keyring/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import click
from ape.logging import logger
from eth_account import Account as EthAccount # type: ignore
from eth_account import Account as EthAccount
from eth_account.signers.local import LocalAccount
from eth_utils import to_bytes

Expand Down
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from setuptools import find_packages, setup # type: ignore
from setuptools import find_packages, setup

extras_require = {
"test": [ # `test` GitHub Action jobs uses this
Expand All @@ -10,9 +10,10 @@
"hypothesis>=6.2.0,<7.0", # Strategy-based fuzzer
],
"lint": [
"black>=22.6.0", # auto-formatter and linter
"mypy>=0.971", # Static type analyzer
"flake8>=4.0.1", # Style linter
"black>=22.10.0", # auto-formatter and linter
"mypy>=0.991", # Static type analyzer
"types-setuptools", # Needed for mypy typeshed
"flake8>=5.0.4", # Style linter
"isort>=5.10.1", # Import sorting linter
],
"release": [ # `release` GitHub Action job uses this
Expand All @@ -29,7 +30,6 @@
],
}

# NOTE: `pip install -e .[dev]` to install package
extras_require["dev"] = (
extras_require["test"]
+ extras_require["lint"]
Expand All @@ -54,7 +54,7 @@
include_package_data=True,
install_requires=[
"click", # Use same version as eth-ape
"eth-ape>=0.5.1,<0.6",
"eth-ape>=0.5.6,<0.6",
"eth-account", # Use same version as eth-ape
"eth-utils", # Use same version as eth-ape
"keyring>=23.9.1,<24",
Expand Down

0 comments on commit 8e6255c

Please sign in to comment.