Skip to content

Commit

Permalink
Merge pull request #156 from kclowes/drop-py36
Browse files Browse the repository at this point in the history
Drop python 3.6 support, add python 3.9 and 3.10 support
  • Loading branch information
kclowes authored Jan 12, 2022
2 parents d6d2f64 + a071a37 commit bb1116d
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 15 deletions.
25 changes: 16 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
1 change: 1 addition & 0 deletions newsfragments/156.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Drop Python 3.6 support, add Python 3.9 and 3.10 support. Update any dependencies accordingly
10 changes: 6 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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",
Expand All @@ -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',
],
)
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist=
py{36,37,38}-core
py{37,38,39,310}-core
lint
docs

Expand All @@ -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
Expand Down

0 comments on commit bb1116d

Please sign in to comment.