From 765b2e441461217a8fada93d51ecf6969cdcda75 Mon Sep 17 00:00:00 2001 From: kclowes Date: Fri, 19 Nov 2021 13:43:20 -0700 Subject: [PATCH 1/4] Add python3.8 support --- .circleci/config.yml | 6 ++++++ setup.py | 1 + tox.ini | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa7691e6..0027cef1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -60,6 +60,12 @@ jobs: - image: circleci/python:3.7 environment: TOXENV: py37-core + py38-core: + <<: *common + docker: + - image: circleci/python:3.8 + environment: + TOXENV: py38-core pypy3-core: <<: *common docker: diff --git a/setup.py b/setup.py index 2b8c7201..65d7904a 100644 --- a/setup.py +++ b/setup.py @@ -75,6 +75,7 @@ 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: Implementation :: PyPy', ], ) diff --git a/tox.ini b/tox.ini index 07b2179c..33b16f2b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist= - py{36,37,py3}-core + py{36,37,38,py3}-core lint docs @@ -28,6 +28,7 @@ basepython = docs: python py36: python3.6 py37: python3.7 + py37: python3.8 pypy3: pypy3 extras= test From fcb5577fa1e20ebe489e26e3a1e588fe87ba1211 Mon Sep 17 00:00:00 2001 From: kclowes Date: Fri, 19 Nov 2021 13:43:36 -0700 Subject: [PATCH 2/4] Add python 3.9 support --- .circleci/config.yml | 6 ++++++ setup.py | 1 + tox.ini | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0027cef1..35ab4b8a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -66,6 +66,12 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-core + py39-core: + <<: *common + docker: + - image: circleci/python:3.9 + environment: + TOXENV: py39-core pypy3-core: <<: *common docker: diff --git a/setup.py b/setup.py index 65d7904a..14567643 100644 --- a/setup.py +++ b/setup.py @@ -76,6 +76,7 @@ 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: Implementation :: PyPy', ], ) diff --git a/tox.ini b/tox.ini index 33b16f2b..049e8e3a 100644 --- a/tox.ini +++ b/tox.ini @@ -28,7 +28,8 @@ basepython = docs: python py36: python3.6 py37: python3.7 - py37: python3.8 + py38: python3.8 + py39: python3.9 pypy3: pypy3 extras= test From d21d58250bc5547993a0e2ec5ab88c3de06a473c Mon Sep 17 00:00:00 2001 From: kclowes Date: Fri, 19 Nov 2021 13:48:19 -0700 Subject: [PATCH 3/4] Add python 3.10 support --- .circleci/config.yml | 6 ++++++ setup.py | 1 + tox.ini | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 35ab4b8a..167ae520 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,6 +72,12 @@ jobs: - image: circleci/python:3.9 environment: TOXENV: py39-core + py310-core: + <<: *common + docker: + - image: circleci/python:3.10 + environment: + TOXENV: py310-core pypy3-core: <<: *common docker: diff --git a/setup.py b/setup.py index 14567643..79241342 100644 --- a/setup.py +++ b/setup.py @@ -77,6 +77,7 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: Implementation :: PyPy', ], ) diff --git a/tox.ini b/tox.ini index 049e8e3a..3148e02b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist= - py{36,37,38,py3}-core + py{36,37,38,39,310,py3}-core lint docs @@ -30,6 +30,7 @@ basepython = py37: python3.7 py38: python3.8 py39: python3.9 + py310: python3.10 pypy3: pypy3 extras= test From 0649062150d7894dd74b00f589f62c7823e3a1ae Mon Sep 17 00:00:00 2001 From: kclowes Date: Fri, 19 Nov 2021 13:51:55 -0700 Subject: [PATCH 4/4] Update pytest to support python 3.10, pin pytest-xdist, bump eth-utils to >=2,<3 --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 79241342..38e0d78b 100644 --- a/setup.py +++ b/setup.py @@ -7,8 +7,8 @@ extras_require = { 'test': [ - "pytest==5.4.1", - "pytest-xdist", + "pytest>=6.2.5,<7", + "pytest-xdist>=2.4.0,<3", "tox==3.14.6", ], 'lint': [ @@ -55,7 +55,7 @@ url='https://github.com/ethereum/', include_package_data=True, install_requires=[ - "eth-utils>=1,<2", + "eth-utils>=2,<3", ], python_requires='>=3.6, <4', extras_require=extras_require,