Skip to content

Commit

Permalink
feat!: Handle 0.7 breaking changes and updates [APE-1549] (#24)
Browse files Browse the repository at this point in the history
  • Loading branch information
NotPeopling2day authored Dec 18, 2023
1 parent 010b3d9 commit edfa126
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 16 deletions.
1 change: 0 additions & 1 deletion .mdformat.toml

This file was deleted.

6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: check-yaml

Expand All @@ -10,7 +10,7 @@ repos:
- id: isort

- repo: https://github.com/psf/black
rev: 23.9.1
rev: 23.12.0
hooks:
- id: black
name: black
Expand All @@ -21,7 +21,7 @@ repos:
- id: flake8

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.5.1
rev: v1.7.1
hooks:
- id: mypy
additional_dependencies: [types-setuptools, pydantic]
Expand Down
2 changes: 1 addition & 1 deletion ape_arbitrum/ecosystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
TransactionStatusEnum,
)
from ape_ethereum.transactions import TransactionType as EthTransactionType
from ethpm_types import HexBytes
from eth_pydantic_types import HexBytes
from pydantic.fields import Field

NETWORKS = {
Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ force_grid_wrap = 0
include_trailing_comma = true
multi_line_output = 3
use_parentheses = true

[tool.mdformat]
number = true
24 changes: 15 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,30 @@
"test": [ # `test` GitHub Action jobs uses this
"pytest>=6.0", # Core testing package
"pytest-mock", # For patching and mocking
"pytest-xdist", # multi-process runner
"pytest-xdist", # Multi-process runner
"pytest-cov", # Coverage analyzer plugin
"hypothesis>=6.2.0,<7.0", # Strategy-based fuzzer
],
"lint": [
"black>=23.9.1,<24", # auto-formatter and linter
"mypy>=1.5.1,<2", # Static type analyzer
"black>=23.12.0,<24", # Auto-formatter and linter
"mypy>=1.7.1,<2", # Static type analyzer
"types-setuptools", # Needed for mypy type shed
"flake8>=6.1.0,<7", # Style linter
"flake8-breakpoint>=1.1.0,<2", # Detect breakpoints left in code
"flake8-print>=5.0.0,<6", # Detect print statements left in code
"isort>=5.10.1,<6", # Import sorting linter
"types-setuptools", # Needed due to mypy typeshed
"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": [
"myst-parser>=0.17.0,<0.18", # Tools for parsing markdown files in the docs
"sphinx-click>=3.1.0,<4.0", # For documenting CLI
"Sphinx>=4.4.0,<5.0", # Documentation generator
"sphinx_rtd_theme>=1.0.0,<2", # Readthedocs.org theme
"myst-parser>=1.0.0,<2", # Parse markdown docs
"sphinx-click>=4.4.0,<5", # For documenting CLI
"Sphinx>=6.1.3,<7", # Documentation generator
"sphinx_rtd_theme>=1.2.0,<2", # Readthedocs.org theme
"sphinxcontrib-napoleon>=0.7", # Allow Google-style documentation
"sphinx-plausible>=0.1.2,<0.2",
],
"release": [ # `release` GitHub Action job uses this
"setuptools", # Installation tool
Expand Down Expand Up @@ -67,7 +71,9 @@
url="https://github.com/ApeWorX/ape-arbitrum",
include_package_data=True,
install_requires=[
"eth-ape>=0.6.0,<0.7",
"eth-ape>=0.7.0,<0.8",
"eth-pydantic-types", # Use same version as eth-ape
"ethpm-types", # Use same version as eth-ape
],
python_requires=">=3.8,<4",
extras_require=extras_require,
Expand Down
5 changes: 3 additions & 2 deletions tests/test_ecosystem.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import pytest
from ape_ethereum.transactions import TransactionType
from ethpm_types import HexBytes, MethodABI
from eth_pydantic_types import HexBytes
from ethpm_types import MethodABI

from ape_arbitrum.ecosystem import INTERNAL_TRANSACTION_TYPE, LOCAL_GAS_LIMIT, ArbitrumReceipt

Expand All @@ -24,7 +25,7 @@ def test_create_transaction(arbitrum, tx_type, eth_tester_provider):
(TransactionType.STATIC.value, TransactionType.DYNAMIC.value, INTERNAL_TRANSACTION_TYPE),
)
def test_encode_transaction(tx_type, arbitrum, eth_tester_provider):
abi = MethodABI.parse_obj(
abi = MethodABI.model_validate(
{
"type": "function",
"name": "fooAndBar",
Expand Down

0 comments on commit edfa126

Please sign in to comment.