From d48afa32e53d27fef9b1e267daf20bd1a80d1aa9 Mon Sep 17 00:00:00 2001 From: danceratopz Date: Mon, 29 Jan 2024 08:10:48 +0100 Subject: [PATCH 1/5] chore: use run-parallel for tox in pre-commit python hook --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2167cebf7a..a0d51c0a09 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ repos: hooks: - id: tox name: tox - entry: tox + entry: tox run-parallel language: system types: [python] pass_filenames: false From deda9b1860b5695d29c65d21c9831c4bf1bb90df Mon Sep 17 00:00:00 2001 From: danceratopz Date: Mon, 29 Jan 2024 08:39:05 +0100 Subject: [PATCH 2/5] chore: use run-parallel for tox in github test actions --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6166c1d3d8..1408d79a0c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -12,12 +12,12 @@ jobs: python: '3.10' solc: '0.8.20' evm-type: 'main' - tox-cmd: 'tox' + tox-cmd: 'tox run-parallel --parallel-no-spinner' - os: ubuntu-latest python: '3.12' solc: '0.8.23' evm-type: 'main' - tox-cmd: 'tox' + tox-cmd: 'tox run-parallel --parallel-no-spinner' - os: ubuntu-latest python: '3.11' solc: '0.8.21' @@ -27,7 +27,7 @@ jobs: python: '3.11' solc: '0.8.22' evm-type: 'main' - tox-cmd: 'tox' + tox-cmd: 'tox run-parallel --parallel-no-spinner' steps: - uses: actions/checkout@v3 with: From 0f6a0aab6ca8064632e04e20b98495ed6058c8f7 Mon Sep 17 00:00:00 2001 From: danceratopz Date: Mon, 29 Jan 2024 08:40:58 +0100 Subject: [PATCH 3/5] chore: use wheel instead of sdist and share across tox envs https://hynek.me/articles/turbo-charge-tox/ --- tox.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tox.ini b/tox.ini index 04f8e382bf..a3a8090f76 100644 --- a/tox.ini +++ b/tox.ini @@ -7,6 +7,10 @@ env_list = [main] development_fork = Cancun +[testenv] +package = wheel +wheel_build_env = .pkg + [testenv:framework] description = Run checks on helper libraries and test framework From 976268502253cde9749b121acdc76e376906b167 Mon Sep 17 00:00:00 2001 From: danceratopz Date: Mon, 29 Jan 2024 09:18:54 +0100 Subject: [PATCH 4/5] docs: update tox command to use run-parallel --- docs/writing_tests/verifying_changes.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/writing_tests/verifying_changes.md b/docs/writing_tests/verifying_changes.md index 24a5211e96..0c62a0d8b6 100644 --- a/docs/writing_tests/verifying_changes.md +++ b/docs/writing_tests/verifying_changes.md @@ -19,6 +19,12 @@ pip install tox Run tox, as executed in Github Actions, with: +```console +tox run-parallel +``` + +or, with sequential test environment execution and verbose output as: + ```console tox ``` From 928b412570ddfadb7f25f3ae7bcbecd38a9c3e3d Mon Sep 17 00:00:00 2001 From: danceratopz Date: Mon, 29 Jan 2024 09:28:48 +0100 Subject: [PATCH 5/5] docs: update changelog --- docs/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 1e4fa4e837..694ad67c93 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -14,6 +14,8 @@ Test fixtures for use by clients are available for each release on the [Github r ### 📋 Misc +- ✨ Use `run-parallel` and shared wheel packages for `tox` ([#408](https://github.com/ethereum/execution-spec-tests/pull/408)). + ### 💥 Breaking Changes ## [v2.0.0](https://github.com/ethereum/execution-spec-tests/releases/tag/v2.0.0) - 2024-01-25: 🐍🏖️ Cancun