diff --git a/.circleci/config.yml b/.circleci/config.yml index e24c9fa6..13679ae7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,21 +39,15 @@ jobs: docs: <<: *common docker: - - image: circleci/python:3.8 + - image: circleci/python:3.10 environment: TOXENV: docs lint: <<: *common docker: - - image: circleci/python:3.8 + - image: circleci/python:3.10 environment: TOXENV: lint - py36-core: - <<: *common - docker: - - image: circleci/python:3.6 - environment: - TOXENV: py36-core py37-core: <<: *common docker: @@ -66,12 +60,25 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-core + py39-core: + <<: *common + docker: + - image: circleci/python:3.9 + environment: + TOXENV: py39-core + py310-core: + <<: *common + docker: + - image: circleci/python:3.10 + environment: + TOXENV: py310-core workflows: version: 2 test: jobs: - docs - lint - - py36-core - py37-core - py38-core + - py39-core + - py310-core diff --git a/newsfragments/156.feature.rst b/newsfragments/156.feature.rst new file mode 100644 index 00000000..1ef41465 --- /dev/null +++ b/newsfragments/156.feature.rst @@ -0,0 +1 @@ +Drop Python 3.6 support, add Python 3.9 and 3.10 support. Update any dependencies accordingly diff --git a/setup.py b/setup.py index 8a9bb55c..594223cc 100644 --- a/setup.py +++ b/setup.py @@ -12,9 +12,9 @@ HYPOTHESIS_REQUIREMENT, ], 'test': [ - "pytest==4.4.1", + "pytest>=6.2.5,<7", "pytest-pythonpath>=0.7.1", - "pytest-xdist==1.22.3", + "pytest-xdist>=2.5.0,<3", "tox>=2.9.1,<3", "eth-hash[pycryptodome]", HYPOTHESIS_REQUIREMENT, @@ -67,7 +67,7 @@ 'eth-typing>=3.0.0,<4.0.0', 'parsimonious>=0.8.0,<0.9.0', ], - python_requires='>=3.6, <4', + python_requires='>=3.7, <4', extras_require=extras_require, py_modules=['eth_abi'], license="MIT", @@ -81,7 +81,9 @@ 'License :: OSI Approved :: MIT License', 'Natural Language :: English', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', ], ) diff --git a/tox.ini b/tox.ini index 9062cbf9..19ec735a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist= - py{36,37,38}-core + py{37,38,39,310}-core lint docs @@ -26,9 +26,10 @@ commands= docs: make build-docs basepython = docs: python - py36: python3.6 py37: python3.7 py38: python3.8 + py39: python3.9 + py310: python3.10 extras= test docs: doc