Skip to content

Commit ce1d57d

Browse files
authored
fix(Deps): use EthPM Types v0.6.28; remove temp upper pin on pydantic (#2703)
1 parent 076c7cd commit ce1d57d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

setup.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@
100100
"packaging>=23.0,<24",
101101
"pandas>=2.2.2,<3",
102102
"pluggy>=1.3,<2",
103-
# TODO: 2.12 introduces a breaking change (see #2701)
104-
"pydantic>=2.10.0,<2.12.0",
103+
"pydantic>=2.10,<3",
105104
"pydantic-settings>=2.5.2,<3",
106105
"pytest>=8.0,<9.0",
107106
"python-dateutil>=2.8.2,<3",
@@ -125,7 +124,7 @@
125124
"web3[tester]>=7.12.1,<8",
126125
# ** Dependencies maintained by ApeWorX **
127126
"eip712>=0.2.10,<0.3",
128-
"ethpm-types>=0.6.27,<0.7",
127+
"ethpm-types>=0.6.28,<0.7",
129128
"eth_pydantic_types>=0.2.1,<0.3",
130129
"evmchains>=0.1.0,<0.2",
131130
"evm-trace>=0.2.6,<0.3",

src/ape/managers/_contractscache.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from typing import TYPE_CHECKING, Generic, Optional, TypeVar, Union
88

99
from ethpm_types import ABI, ContractType
10+
from ethpm_types.contract_type import ABIList
1011
from pydantic import BaseModel
1112

1213
from ape.api.networks import ProxyInfoAPI
@@ -772,7 +773,7 @@ def instance_at(
772773
raise # Current exception
773774

774775
# If the ABI was a str, it should be a list now.
775-
if isinstance(abi, list):
776+
if isinstance(abi, (ABIList, list)):
776777
contract_type = ContractType(abi=abi)
777778

778779
# Ensure we cache the contract-types from ABI!

0 commit comments

Comments
 (0)