Skip to content

Commit 8d23b09

Browse files
committed
Refactor install extras:
- Require `tester` for `test` install extra. The whole of the core test suite needs eth-tester to run and integration tests rely on py-geth. - Leave dependencies needed for test runs only on the `test` extra, removing them from the `dev` extra. The `dev` extra is re-defined below and pulls in all of the `test` extra dependencies.
1 parent 9baae32 commit 8d23b09

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

newsfragments/3495.internal.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Re-organize the install extras. Re-define the ``test`` extra to always include the ``tester`` extra since it's needed for testing.

setup.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,16 @@
66

77
extras_require = {
88
"tester": [
9+
# Note: ethereum-maintained libraries in this list should be added to the
10+
# `install_pre_releases.py` script.
911
"eth-tester[py-evm]>=0.11.0b1,<0.13.0b1",
1012
"py-geth>=5.0.0",
1113
],
1214
"dev": [
1315
"build>=0.9.0",
1416
"bumpversion>=0.5.3",
15-
"flaky>=3.7.0",
16-
"hypothesis>=3.31.2",
1717
"ipython",
18-
"mypy==1.10.0",
19-
"pre-commit>=3.4.0",
20-
"pytest-asyncio>=0.21.2,<0.23",
21-
"pytest-mock>=1.10",
2218
"setuptools>=38.6.0",
23-
"tox>=4.0.0",
2419
"tqdm>4.32",
2520
"twine>=1.13",
2621
"wheel",
@@ -32,12 +27,15 @@
3227
"towncrier>=21,<22",
3328
],
3429
"test": [
35-
# Note: ethereum-maintained libraries in this list should be added to the
36-
# `install_pre_releases.py` script.
3730
"pytest-asyncio>=0.18.1,<0.23",
3831
"pytest-mock>=1.10",
3932
"pytest-xdist>=2.4.0",
4033
"pytest>=7.0.0",
34+
"flaky>=3.7.0",
35+
"hypothesis>=3.31.2",
36+
"tox>=4.0.0",
37+
"mypy==1.10.0",
38+
"pre-commit>=3.4.0",
4139
],
4240
}
4341

@@ -47,6 +45,7 @@
4745
+ extras_require["test"]
4846
+ extras_require["tester"]
4947
)
48+
extras_require["test"] = extras_require["test"] + extras_require["tester"]
5049

5150

5251
with open("./README.md") as readme:

0 commit comments

Comments
 (0)