From 627443f01ec8acaf1553919fcf573c4bca960e63 Mon Sep 17 00:00:00 2001 From: El De-dog-lo <3859395+fubuloubu@users.noreply.github.com> Date: Wed, 1 Dec 2021 18:16:48 -0500 Subject: [PATCH 1/9] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 914dc96034..32a837eace 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ keywords="ethereum evm smart contract language", include_package_data=True, packages=find_packages(exclude=("tests", "docs")), - python_requires=">=3.7,<3.10", + python_requires=">=3.7,<3.11", py_modules=["vyper"], install_requires=[ "asttokens==2.0.5", From 139ba49a374ba6ca959b2529600b0b5c7ed44652 Mon Sep 17 00:00:00 2001 From: El De-dog-lo <3859395+fubuloubu@users.noreply.github.com> Date: Wed, 1 Dec 2021 18:18:04 -0500 Subject: [PATCH 2/9] Update setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 32a837eace..1ad2d054ca 100644 --- a/setup.py +++ b/setup.py @@ -73,5 +73,6 @@ "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", ], ) From 6d8db9d5d5365a926fa970afab4164f9c5b01c9d Mon Sep 17 00:00:00 2001 From: El De-dog-lo <3859395+fubuloubu@users.noreply.github.com> Date: Wed, 1 Dec 2021 18:19:40 -0500 Subject: [PATCH 3/9] add 3.10 workflow --- .github/workflows/test.yml | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1e82c1c587..fce7b0cd48 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -178,6 +178,47 @@ jobs: run: TOXENV=py39-no-opt tox -r + py310-core: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - name: Set up Python 3.10 + uses: actions/setup-python@v1 + with: + python-version: 3.10 + + - name: Install Tox + run: pip install tox + + - name: Run Tox + run: TOXENV=py310-core tox -r + + - name: Upload Coverage + uses: codecov/codecov-action@v1 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: ./coverage.xml + + py310-no-opt: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - name: Set up Python 3.10 + uses: actions/setup-python@v1 + with: + python-version: 3.10 + + - name: Install Tox + run: pip install tox + + - name: Run Tox + run: TOXENV=py310-no-opt tox -r + + fuzzing: runs-on: ubuntu-latest From 6d9da744b178b1e7db0d5b50ccb9cfe7b0a119a5 Mon Sep 17 00:00:00 2001 From: El De-dog-lo <3859395+fubuloubu@users.noreply.github.com> Date: Wed, 1 Dec 2021 18:20:11 -0500 Subject: [PATCH 4/9] Update tox.ini --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index a98bef49c7..df168e4eed 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{37,38,39}-{core,no-opt} + py{37,38,39,310}-{core,no-opt} lint mypy docs @@ -14,6 +14,7 @@ basepython = py37: python3.7 py38: python3.8 py39: python3.9 + py310: python3.10 extras = test whitelist_externals = make From c0722048a34c7e42fc676593ec3cbe6a62cb5bdd Mon Sep 17 00:00:00 2001 From: Charles Cooper Date: Wed, 1 Dec 2021 16:27:02 -0800 Subject: [PATCH 5/9] fix yaml parsing of "3.10" yaml parses current as the float `3.1` --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fce7b0cd48..95ecca6416 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -187,7 +187,7 @@ jobs: - name: Set up Python 3.10 uses: actions/setup-python@v1 with: - python-version: 3.10 + python-version: "3.10" - name: Install Tox run: pip install tox @@ -210,7 +210,7 @@ jobs: - name: Set up Python 3.10 uses: actions/setup-python@v1 with: - python-version: 3.10 + python-version: "3.10" - name: Install Tox run: pip install tox From f82ed78335b52b87d6feed8885f69ff85e42db00 Mon Sep 17 00:00:00 2001 From: Charles Cooper Date: Sun, 9 Jan 2022 16:58:17 +0000 Subject: [PATCH 6/9] try to fix blake2b-py dep --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 1ad2d054ca..bbb623a853 100644 --- a/setup.py +++ b/setup.py @@ -8,8 +8,8 @@ "pytest-cov>=2.10,<3.0", "pytest-instafail>=0.4,<1.0", "pytest-xdist>=1.32,<2.0", - "eth-tester[py-evm]>=0.5.0b1,<0.6", - "py-evm==0.4.0a4", # NOTE: temporarily pinned until we have support for py-evm 0.5.0a0+ + "eth-tester[py-evm,blake2b-py]>=0.5.0b1,<0.6", + "py-evm[blake2b-py]==0.4.0a4", # NOTE: temporarily pinned until we have support for py-evm 0.5.0a0+ "web3==5.21.0", "tox>=3.15,<4.0", "lark-parser==0.10.0", From 17d4596639fb3338ee793cb28b6393ac243a5b8e Mon Sep 17 00:00:00 2001 From: Charles Cooper Date: Wed, 2 Feb 2022 14:32:42 -0500 Subject: [PATCH 7/9] update web3.py --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 303c49ae20..49b14fd0ea 100644 --- a/setup.py +++ b/setup.py @@ -11,8 +11,8 @@ "pytest-instafail>=0.4,<1.0", "pytest-xdist>=1.32,<2.0", "eth-tester[py-evm,blake2b-py]>=0.6.0b4,<0.7", - "py-evm[blake2b-py]>=0.5.0a1", - "web3==5.21.0", + "py-evm[blake2b-py]>=0.5.0a3", + "web3==5.27.0", "tox>=3.15,<4.0", "lark-parser==0.10.0", "hypothesis[lark]>=5.37.1,<6.0", From b5379cb56a6b25d1af713a2d141cbf3711301559 Mon Sep 17 00:00:00 2001 From: Charles Cooper Date: Wed, 2 Feb 2022 14:34:06 -0500 Subject: [PATCH 8/9] remove blake2b-py again --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 49b14fd0ea..f76c8dd05a 100644 --- a/setup.py +++ b/setup.py @@ -10,8 +10,8 @@ "pytest-cov>=2.10,<3.0", "pytest-instafail>=0.4,<1.0", "pytest-xdist>=1.32,<2.0", - "eth-tester[py-evm,blake2b-py]>=0.6.0b4,<0.7", - "py-evm[blake2b-py]>=0.5.0a3", + "eth-tester[py-evm]>=0.6.0b4,<0.7", + "py-evm>=0.5.0a3", "web3==5.27.0", "tox>=3.15,<4.0", "lark-parser==0.10.0", From 5533cbb544255ff538e05c04cdff710e357ef0d9 Mon Sep 17 00:00:00 2001 From: Charles Cooper Date: Wed, 2 Feb 2022 14:42:47 -0500 Subject: [PATCH 9/9] add upper bound to py-evm --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f76c8dd05a..186d36cd28 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ "pytest-instafail>=0.4,<1.0", "pytest-xdist>=1.32,<2.0", "eth-tester[py-evm]>=0.6.0b4,<0.7", - "py-evm>=0.5.0a3", + "py-evm>=0.5.0a3,<0.6", "web3==5.27.0", "tox>=3.15,<4.0", "lark-parser==0.10.0",