From 77f2f343a7c195a67c217461f7fb4c0857a47925 Mon Sep 17 00:00:00 2001 From: Ben Hauser Date: Thu, 1 Feb 2024 01:39:43 +0400 Subject: [PATCH] chore: update github workflow and tox --- ...anache-3.7.yaml => core-ganache-3.10.yaml} | 18 ++++++------- ...anache-3.8.yaml => core-ganache-3.11.yaml} | 20 +++++++------- ...anache-3.9.yaml => core-ganache-3.12.yaml} | 27 ++++++++----------- .github/workflows/evm.yaml | 12 ++++----- .github/workflows/functionality.yaml | 12 ++++----- .github/workflows/lint.yaml | 8 +++--- tox.ini | 14 +++++----- 7 files changed, 53 insertions(+), 58 deletions(-) rename .github/workflows/{core-ganache-3.7.yaml => core-ganache-3.10.yaml} (71%) rename .github/workflows/{core-ganache-3.8.yaml => core-ganache-3.11.yaml} (65%) rename .github/workflows/{core-ganache-3.9.yaml => core-ganache-3.12.yaml} (57%) diff --git a/.github/workflows/core-ganache-3.7.yaml b/.github/workflows/core-ganache-3.10.yaml similarity index 71% rename from .github/workflows/core-ganache-3.7.yaml rename to .github/workflows/core-ganache-3.10.yaml index 18b210ed5..adaa81cbf 100644 --- a/.github/workflows/core-ganache-3.7.yaml +++ b/.github/workflows/core-ganache-3.10.yaml @@ -1,4 +1,4 @@ -name: Core Ganache (py37) +name: Core Ganache (py3.10) on: ["push", "pull_request"] env: @@ -7,11 +7,11 @@ env: WEB3_INFURA_PROJECT_ID: ddddf0c53f254d36aa76ce4e3a6a390e jobs: - py37core: + py310core: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache Solidity Installations uses: actions/cache@v2 @@ -22,21 +22,21 @@ jobs: key: ${{ runner.os }}-compiler-cache - name: Setup Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 - name: Install Ganache - run: npm install -g ganache@7.0.2 + run: npm install -g ganache@7.9.2 - - name: Setup Python 3.7 - uses: actions/setup-python@v2 + - name: Setup Python 3.10 + uses: actions/setup-python@v5 with: - python-version: 3.7 + python-version: "3.10" - name: Install Tox run: pip install tox - name: Run Tox - run: tox -e py37 + run: tox -e py310 - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 diff --git a/.github/workflows/core-ganache-3.8.yaml b/.github/workflows/core-ganache-3.11.yaml similarity index 65% rename from .github/workflows/core-ganache-3.8.yaml rename to .github/workflows/core-ganache-3.11.yaml index 970c93f62..5beb9c65f 100644 --- a/.github/workflows/core-ganache-3.8.yaml +++ b/.github/workflows/core-ganache-3.11.yaml @@ -1,17 +1,17 @@ -name: Core Ganache (py38) +name: Core Ganache (py3.11) on: ["push", "pull_request"] env: ETHERSCAN_TOKEN: 9MKURTHE8FNA9NRUUJBHMUEVY6IQ5K1EGY GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - WEB3_INFURA_PROJECT_ID: 21317ddb5ded42ce8d40c7d78f90474f + WEB3_INFURA_PROJECT_ID: ddddf0c53f254d36aa76ce4e3a6a390e jobs: - py38core: + py310core: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache Solidity Installations uses: actions/cache@v2 @@ -22,21 +22,21 @@ jobs: key: ${{ runner.os }}-compiler-cache - name: Setup Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 - name: Install Ganache - run: npm install -g ganache@7.0.2 + run: npm install -g ganache@7.9.2 - - name: Setup Python 3.8 - uses: actions/setup-python@v2 + - name: Setup Python 3.11 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: "3.11" - name: Install Tox run: pip install tox - name: Run Tox - run: tox -e py38 + run: tox -e py311 - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 diff --git a/.github/workflows/core-ganache-3.9.yaml b/.github/workflows/core-ganache-3.12.yaml similarity index 57% rename from .github/workflows/core-ganache-3.9.yaml rename to .github/workflows/core-ganache-3.12.yaml index 6156bbcda..33d1d772a 100644 --- a/.github/workflows/core-ganache-3.9.yaml +++ b/.github/workflows/core-ganache-3.12.yaml @@ -1,22 +1,17 @@ -name: Core Ganache (py39) +name: Core Ganache (py3.12) on: ["push", "pull_request"] env: ETHERSCAN_TOKEN: 9MKURTHE8FNA9NRUUJBHMUEVY6IQ5K1EGY GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - WEB3_INFURA_PROJECT_ID: 1668fecbc9c242d58253476103a42ce9 + WEB3_INFURA_PROJECT_ID: ddddf0c53f254d36aa76ce4e3a6a390e jobs: - py39core: - runs-on: ${{ matrix.os }} - - strategy: - fail-fast: false - matrix: - os: [windows-latest, ubuntu-latest] + py310core: + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache Solidity Installations uses: actions/cache@v2 @@ -27,21 +22,21 @@ jobs: key: ${{ runner.os }}-compiler-cache - name: Setup Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 - name: Install Ganache - run: npm install -g ganache@7.0.2 + run: npm install -g ganache@7.9.2 - - name: Setup Python 3.9 - uses: actions/setup-python@v2 + - name: Setup Python 3.12 + uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: "3.12" - name: Install Tox run: pip install tox - name: Run Tox - run: tox -e py39 + run: tox -e py312 - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 diff --git a/.github/workflows/evm.yaml b/.github/workflows/evm.yaml index 5c461eccb..63be8f6a3 100644 --- a/.github/workflows/evm.yaml +++ b/.github/workflows/evm.yaml @@ -18,7 +18,7 @@ jobs: job: [evm-byzantium, evm-petersburg, evm-istanbul, evm-latest] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache Solidity Installations uses: actions/cache@v2 @@ -29,15 +29,15 @@ jobs: key: ${{ runner.os }}-compiler-cache - name: Setup Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 - name: Install Ganache - run: npm install -g ganache@7.0.2 + run: npm install -g ganache@7.9.2 - - name: Setup Python 3.8 - uses: actions/setup-python@v2 + - name: Setup Python 3.10 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: "3.10" - name: Install Tox run: pip install tox diff --git a/.github/workflows/functionality.yaml b/.github/workflows/functionality.yaml index c2b1e0ca0..c0adf7541 100644 --- a/.github/workflows/functionality.yaml +++ b/.github/workflows/functionality.yaml @@ -18,7 +18,7 @@ jobs: job: [plugintest, pmtest] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache Solidity Installations uses: actions/cache@v2 @@ -29,15 +29,15 @@ jobs: key: ${{ runner.os }}-compiler-cache - name: Setup Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 - name: Install Ganache - run: npm install -g ganache@7.0.2 + run: npm install -g ganache@7.9.2 - - name: Setup Python 3.8 - uses: actions/setup-python@v2 + - name: Setup Python 3.10 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: "3.10" - name: Install Tox run: pip install tox diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 6dfb43021..6a89de0b3 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -22,12 +22,12 @@ jobs: experimental: true steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - name: Setup Python 3.8 - uses: actions/setup-python@v2 + - name: Setup Python 3.10 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: "3.10" - name: Install Tox run: pip install tox diff --git a/tox.ini b/tox.ini index 414e63bcc..1bbf54cf9 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ envlist = lint docs-{local,external} - py{37,38,39} + py{310,311,312} {pm,evm,plugin}test evm-{byzantium,petersburg,istanbul,latest} @@ -12,16 +12,16 @@ passenv = GITHUB_TOKEN WEB3_INFURA_PROJECT_ID deps = - py{37,38,39},{pm,plugin}test,evm-{byzantium,petersburg,istanbul,latest}: coverage==5.2.1 - py{37,38,39},{pm,plugin}test,evm-{byzantium,petersburg,istanbul,latest}: pytest==6.0.1 - py{37,38,39},{pm,plugin}test,evm-{byzantium,petersburg,istanbul,latest}: pytest-cov==2.10.1 - py{37,38,39},{pm,plugin}test,evm-{byzantium,petersburg,istanbul,latest}: pytest-mock==3.3.1 - py{37,38,39},{pm,plugin}test,evm-{byzantium,petersburg,istanbul,latest}: pytest-xdist==1.34.0 + py{310,311,312},{pm,plugin}test,evm-{byzantium,petersburg,istanbul,latest}: coverage==5.2.1 + py{310,311,312},{pm,plugin}test,evm-{byzantium,petersburg,istanbul,latest}: pytest==6.0.1 + py{310,311,312},{pm,plugin}test,evm-{byzantium,petersburg,istanbul,latest}: pytest-cov==2.10.1 + py{310,311,312},{pm,plugin}test,evm-{byzantium,petersburg,istanbul,latest}: pytest-mock==3.3.1 + py{310,311,312},{pm,plugin}test,evm-{byzantium,petersburg,istanbul,latest}: pytest-xdist==1.34.0 docs-{local,external}: sphinx docs-{local,external}: sphinx_rtd_theme docs-{local,external}: pygments_lexer_solidity commands = - py{37,38,39}: python -m pytest tests/ {posargs} + py{310,311,312}: python -m pytest tests/ {posargs} evm-byzantium: python -m pytest tests/ --evm 0.4.22,0.4.26,0.5.0,0.5.17,0.6.3,0.6.9 byzantium 0,10000 evm-petersburg: python -m pytest tests/ --evm 0.5.5,0.5.17,0.6.3,0.6.9 petersburg 0,10000 evm-istanbul: python -m pytest tests/ --evm 0.5.13,0.5.17,0.6.3,0.6.9 istanbul 0,10000