Skip to content

Commit

Permalink
Merge pull request #1538 from javimaravillas/fix/pytest-pluggy-dev
Browse files Browse the repository at this point in the history
eth-abi 1.2.2 has requirement eth-typing<2, but you'll have eth-typing 2.0.0 which is incompatible.but you'll ha…
  • Loading branch information
carver committed Dec 7, 2018
2 parents 6a504d5 + ac8ea9a commit b10f1ed
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# Installing these libraries may make the evm perform better than
# using the default fallbacks though.
'eth-extra': [
"coincurve>=8.0.0,<9.0.0",
"coincurve>=10.0.0,<11.0.0",
"eth-hash[pysha3];implementation_name=='cpython'",
"eth-hash[pycryptodome];implementation_name=='pypy'",
"plyvel==1.0.5",
Expand All @@ -40,7 +40,7 @@
"async-generator==1.10",
"bloom-filter==1.3",
"cachetools>=2.1.0,<3.0.0",
"coincurve>=8.0.0,<9.0.0",
"coincurve>=10.0.0,<11.0.0",
"ipython>=6.2.1,<7.0.0",
"plyvel==1.0.5",
"web3==4.4.1",
Expand Down Expand Up @@ -83,6 +83,10 @@
"bumpversion>=0.5.3,<1",
"wheel",
"setuptools>=36.2.0",
#Fixing this dependency due to: pytest 3.6.4 has requirement pluggy<0.8,>=0.5, but you'll have pluggy 0.8.0 which is incompatible.
"pluggy==0.7.1",
#Fixing this dependency due to: requests 2.20.1 has requirement idna<2.8,>=2.5, but you'll have idna 2.8 which is incompatible.
"idna==2.7",
"tox==2.7.0",
"twine",
],
Expand Down

0 comments on commit b10f1ed

Please sign in to comment.