Skip to content

Commit 2eaf026

Browse files
voithpipermerriam
authored andcommitted
removed p2p and trinity dependencies from py-evm(eth) (#1193)
add p2p and trinity dependencies to tox added trinity and p2p dependencies at missing places in tox added trinity and p2p dependencies to docs testing in tox
1 parent 7508476 commit 2eaf026

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

setup.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,8 @@
9090
deps['lint']
9191
)
9292

93-
# As long as eth, p2p and trinity are managed together in the py-evm
94-
# package, someone running a `pip install py-evm` should expect all
95-
# dependencies for eth, p2p and trinity to get installed.
96-
install_requires = deps['eth'] + deps['p2p'] + deps['trinity']
93+
94+
install_requires = deps['eth']
9795

9896
setup(
9997
name='py-evm',

tox.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ commands=
4242
native-state-metropolis: pytest {posargs:tests/json-fixtures/test_state.py -k Metropolis}
4343
lightchain_integration: pytest --integration {posargs:tests/trinity/integration/test_lightchain_integration.py}
4444

45-
deps = .[eth-extras, test]
45+
deps = .[p2p, trinity, eth-extras, test]
4646

4747
basepython =
4848
py35: python3.5
@@ -53,7 +53,7 @@ basepython =
5353
[testenv:py36-docs]
5454
whitelist_externals=
5555
make
56-
deps = .[doc]
56+
deps = .[p2p, trinity, doc]
5757
passenv =
5858
PYTEST_ADDOPTS
5959
TRAVIS_EVENT_TYPE
@@ -62,7 +62,7 @@ commands=
6262

6363

6464
[common-trinity-integration]
65-
deps = .[eth-extras, test]
65+
deps = .[p2p, trinity, eth-extras, test]
6666
passenv =
6767
PYTEST_ADDOPTS
6868
TRAVIS_EVENT_TYPE
@@ -83,7 +83,7 @@ commands = {[common-trinity-integration]commands}
8383

8484

8585
[testenv:py36-benchmark]
86-
deps = .[eth-extras, benchmark]
86+
deps = .[p2p, trinity, eth-extras, benchmark]
8787
commands=
8888
benchmark: {toxinidir}/scripts/benchmark/run.py
8989

0 commit comments

Comments
 (0)