From e6c68752bcaa967ab812c15251acadbb2b054e8f Mon Sep 17 00:00:00 2001 From: NotPeopling2day <32708219+NotPeopling2day@users.noreply.github.com> Date: Wed, 22 Nov 2023 15:01:38 +0100 Subject: [PATCH] chore: update versions --- .mdformat.toml | 1 - .pre-commit-config.yaml | 4 ++-- pyproject.toml | 3 +++ setup.py | 17 +++++++++-------- tests/test_provider.py | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 .mdformat.toml diff --git a/.mdformat.toml b/.mdformat.toml deleted file mode 100644 index 01b2fb0..0000000 --- a/.mdformat.toml +++ /dev/null @@ -1 +0,0 @@ -number = true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6094909..e9b019a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ repos: - id: isort - repo: https://github.com/psf/black - rev: 23.10.1 + rev: 23.11.0 hooks: - id: black name: black @@ -21,7 +21,7 @@ repos: - id: flake8 - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.6.1 + rev: v1.7.0 hooks: - id: mypy additional_dependencies: [types-PyYAML, types-requests, types-setuptools, pydantic] diff --git a/pyproject.toml b/pyproject.toml index ad09a3b..dc6543e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,3 +41,6 @@ force_grid_wrap = 0 include_trailing_comma = true multi_line_output = 3 use_parentheses = true + +[tool.mdformat] +number = true diff --git a/setup.py b/setup.py index 662c648..38515cb 100644 --- a/setup.py +++ b/setup.py @@ -13,16 +13,17 @@ "ape-polygon", # For running polygon fork tests ], "lint": [ - "black>=23.10.1,<24", # auto-formatter and linter - "mypy>=1.6.1,<2", # Static type analyzer - "types-requests", # Needed due to mypy typeshed - "types-setuptools", # Needed due to mypy typeshed - "types-PyYAML", # Needed due to mypy typeshed - "flake8>=6.0.1,<7", # Style linter + "black>=23.11.0,<24", # Auto-formatter and linter + "mypy>=1.7.0,<2", # Static type analyzer + "types-requests", # Needed for mypy type shed + "types-setuptools", # Needed for mypy type shed + "types-PyYAML", # Needed for mypy type shed + "flake8>=6.1.0,<7", # Style linter "isort>=5.10.1,<6", # Import sorting linter "mdformat>=0.7.17", # Auto-formatter for markdown "mdformat-gfm>=0.3.5", # Needed for formatting GitHub-flavored markdown "mdformat-frontmatter>=0.4.1", # Needed for frontmatters-style headers in issue templates + "mdformat-pyproject>=0.0.1", # Allows configuring in pyproject.toml ], "doc": [ "Sphinx>=6.1.3,<7", # Documentation generator @@ -69,9 +70,9 @@ url="https://github.com/ApeWorX/ape-foundry", include_package_data=True, install_requires=[ - "eth-ape>=0.6.24,<0.7", + "eth-ape>=0.7.0,<0.8", + "ethpm-types", # Use same version as eth-ape "evm-trace", # Use same version as ape - "hexbytes", # Use same version as ape "web3", # Use same version as ape "yarl", # Use same version as ape ], diff --git a/tests/test_provider.py b/tests/test_provider.py index 8cb125c..df9bb46 100644 --- a/tests/test_provider.py +++ b/tests/test_provider.py @@ -8,7 +8,7 @@ from ape.types import CallTreeNode, TraceFrame from eth_utils import to_int from evm_trace import CallType -from hexbytes import HexBytes +from ethpm_types import HexBytes from ape_foundry import FoundryProviderError from ape_foundry.provider import FOUNDRY_CHAIN_ID