Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support latest tox v4 #2751

Merged
merged 2 commits into from
Dec 8, 2022
Merged

Support latest tox v4 #2751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f02d210
Add support for tox 4+
kclowes Dec 7, 2022
17cfe31
Add newsfragment
kclowes Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ethpm/_utils/protobuf/ipfs_file_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions newsfragments/2751.misc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allow tox versions 3.18+
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

extras_require = {
"tester": [
"eth-tester[py-evm]==v0.7.0-beta.1",
"eth-tester[py-evm]==v0.7.0-b.1",
"py-geth>=3.10.0",
],
"linter": [
Expand Down Expand Up @@ -45,7 +45,7 @@
"pytest-watch>=4.2",
"pytest-xdist>=1.29",
"setuptools>=38.6.0",
"tox>=1.8.0",
"tox>=3.18.0",
"tqdm>4.32",
"twine>=1.13",
"pluggy==0.13.1",
Expand Down
19 changes: 10 additions & 9 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ exclude= venv*,.tox,docs,build
extend-ignore=E203,W503

[testenv]
whitelist_externals=/usr/bin/make
allowlist_externals=/usr/bin/make
install_command=python -m pip install --no-use-pep517 {opts} {packages}
usedevelop=True
commands=
Expand Down Expand Up @@ -66,7 +66,7 @@ commands=
flake8 {toxinidir}/web3 {toxinidir}/ens {toxinidir}/ethpm {toxinidir}/tests --exclude {toxinidir}/ethpm/ethpm-spec,{toxinidir}/**/*_pb2.py
black {toxinidir}/ens {toxinidir}/ethpm {toxinidir}/web3 {toxinidir}/tests {toxinidir}/setup.py --exclude /ethpm/ethpm-spec/|/ethpm/_utils/protobuf/ipfs_file_pb2\.py --check
isort --recursive --skip {toxinidir}/ethpm/_utils/protobuf/ipfs_file_pb2.py --skip {toxinidir}/ethpm/ethpm-spec --check-only --diff {toxinidir}/web3/ {toxinidir}/ens/ {toxinidir}/ethpm/ {toxinidir}/tests/
mypy -p web3 -p ethpm -p ens --exclude ethpm/_utils/protobuf/ipfs_file_pb2\.py --config-file {toxinidir}/mypy.ini
mypy -p web3 -p ethpm -p ens --config-file {toxinidir}/mypy.ini

[testenv:benchmark]
basepython=python
Expand All @@ -77,42 +77,43 @@ commands=

[common-wheel-cli]
deps=wheel
whitelist_externals=
allowlist_externals=
/bin/rm
/bin/bash
commands=
pip install --upgrade pip
/bin/rm -rf build dist
python setup.py sdist bdist_wheel
/bin/bash -c 'pip install --upgrade "$(ls dist/web3-*-py3-none-any.whl)" --progress-bar off'
python -c "from web3 import Web3"

[testenv:py37-wheel-cli]
deps={[common-wheel-cli]deps}
whitelist_externals={[common-wheel-cli]whitelist_externals}
allowlist_externals={[common-wheel-cli]allowlist_externals}
commands={[common-wheel-cli]commands}
skip_install=true

[testenv:py38-wheel-cli]
deps={[common-wheel-cli]deps}
whitelist_externals={[common-wheel-cli]whitelist_externals}
allowlist_externals={[common-wheel-cli]allowlist_externals}
commands={[common-wheel-cli]commands}
skip_install=true

[testenv:py39-wheel-cli]
deps={[common-wheel-cli]deps}
whitelist_externals={[common-wheel-cli]whitelist_externals}
allowlist_externals={[common-wheel-cli]allowlist_externals}
commands={[common-wheel-cli]commands}
skip_install=true

[testenv:py310-wheel-cli]
deps={[common-wheel-cli]deps}
whitelist_externals={[common-wheel-cli]whitelist_externals}
allowlist_externals={[common-wheel-cli]allowlist_externals}
commands={[common-wheel-cli]commands}
skip_install=true

[common-wheel-cli-windows]
deps=wheel
whitelist_externals=
allowlist_externals=
bash.exe
commands=
bash.exe -c "rm -rf build dist"
Expand All @@ -122,6 +123,6 @@ commands=

[testenv:py37-wheel-cli-windows]
deps={[common-wheel-cli]deps}
whitelist_externals={[common-wheel-cli-windows]whitelist_externals}
allowlist_externals={[common-wheel-cli-windows]allowlist_externals}
commands={[common-wheel-cli-windows]commands}
skip_install=true