Skip to content

Commit

Permalink
Merge pull request #616 from ethereum/carver/fix-eth-utils-conflict
Browse files Browse the repository at this point in the history
eth-utils v1 compatibility across all dependencies
  • Loading branch information
carver authored Feb 7, 2018
2 parents abe28e0 + 7e85d6d commit aae3ba9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions docs/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Release Notes
v4.0.0-beta.7
-------------

Released Jan 29, 2017
Released Jan 29, 2018

- Support for :meth:`web3.eth.Eth.getLogs` in eth-tester with py-evm
- Process transaction receipts with Event ABI, using
Expand All @@ -20,7 +20,7 @@ Released Jan 29, 2017
v4.0.0-beta.6
-------------

Released Jan 18, 2017
Released Jan 18, 2018

- New contract function call API: `my_contract.functions.my_func().call()` is preferred over the now
deprecated `my_contract.call().my_func()` API.
Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
include_package_data=True,
install_requires=[
"cytoolz>=0.9.0,<1.0.0",
"eth-abi>=0.5.0,<1.0.0",
"eth-abi>=1.0.0-beta.0,<2",
"eth-account>=0.1.0a2,<1.0.0",
"eth-keyfile>=0.4.0,<1.0.0",
"eth-keys>=0.1.0b4,<0.2.0",
"eth-utils>=1.0.0b1,<2.0.0",
"hexbytes>=0.1.0b0,<1.0.0",
"lru-dict>=1.1.6,<2.0.0",
Expand All @@ -31,7 +29,7 @@
setup_requires=['setuptools-markdown'],
extras_require={
'tester': [
"eth-tester[py-evm]==0.1.0b15",
"eth-tester[py-evm]==0.1.0b16",
],
'testrpc': ["eth-testrpc>=1.3.3,<2.0.0"],
'linter': [
Expand Down

0 comments on commit aae3ba9

Please sign in to comment.