Skip to content
This repository has been archived by the owner on Jul 1, 2021. It is now read-only.

Commit

Permalink
Remove support for Python 3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@cburgdorf
cburgdorf committed Apr 16, 2020
1 parent 1c7f8b2 commit da0eef1
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 194 deletions.
187 changes: 48 additions & 139 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,173 +113,95 @@ eth2_fixtures: &eth2_fixtures
- ./eth2-fixtures
key: cache-v3-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}-{{ checksum "./.circleci/get_eth2_fixtures.sh" }}-{{ checksum "./.circleci/build_geth.sh" }}
jobs:
py36-lint:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-lint
py37-lint:
<<: *common
docker:
- image: circleci/python:3.7
environment:
TOXENV: py37-lint
py36-lint-eth2:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-lint-eth2
py37-lint-eth2:
<<: *common
docker:
- image: circleci/python:3.7
environment:
TOXENV: py37-lint-eth2

py36-docs:
py37-docs:
<<: *common
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
environment:
TOXENV: py36-docs
TOXENV: py37-docs

py36-rpc-state-byzantium:
py37-rpc-state-byzantium:
<<: *common
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
environment:
TOXENV: py36-rpc-state-byzantium
py36-rpc-state-constantinople:
TOXENV: py37-rpc-state-byzantium
py37-rpc-state-constantinople:
<<: *common
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
environment:
TOXENV: py36-rpc-state-constantinople
py36-rpc-state-frontier:
TOXENV: py37-rpc-state-constantinople
py37-rpc-state-frontier:
<<: *common
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
environment:
TOXENV: py36-rpc-state-frontier
py36-rpc-state-homestead:
TOXENV: py37-rpc-state-frontier
py37-rpc-state-homestead:
<<: *common
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
environment:
TOXENV: py36-rpc-state-homestead
py36-rpc-state-istanbul:
TOXENV: py37-rpc-state-homestead
py37-rpc-state-istanbul:
<<: *common
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
environment:
TOXENV: py36-rpc-state-istanbul
py36-rpc-state-petersburg:
TOXENV: py37-rpc-state-istanbul
py37-rpc-state-petersburg:
<<: *common
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
environment:
TOXENV: py36-rpc-state-petersburg
TOXENV: py37-rpc-state-petersburg

py36-rpc-state-tangerine_whistle:
py37-rpc-state-tangerine_whistle:
<<: *common
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
environment:
TOXENV: py36-rpc-state-tangerine_whistle
py36-rpc-state-spurious_dragon:
TOXENV: py37-rpc-state-tangerine_whistle
py37-rpc-state-spurious_dragon:
<<: *common
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
environment:
TOXENV: py36-rpc-state-spurious_dragon
py36-rpc-blockchain:
TOXENV: py37-rpc-state-spurious_dragon
py37-rpc-blockchain:
<<: *common
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
environment:
TOXENV: py36-rpc-blockchain
TOXENV: py37-rpc-blockchain

py36-eth1-core:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-eth1-core
py36-integration:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-integration
py36-lightchain_integration:
py37-lightchain_integration:
<<: *geth_steps
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
environment:
TOXENV: py36-lightchain_integration
TOXENV: py37-lightchain_integration
GETH_VERSION: v1.8.22
py36-long_run_integration:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-long_run_integration
py36-p2p:
py37-long_run_integration:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-p2p
py36-p2p-trio:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-p2p-trio
py36-eth2-core:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-eth2-core
py36-eth2-utils:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-eth2-utils
py36-eth2-fixtures:
<<: *eth2_fixtures
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-eth2-fixtures
py36-eth2-integration:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-eth2-integration
py36-wheel-cli:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-wheel-cli
py36-eth1-components:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-eth1-components
py36-eth2-trio:
<<: *common
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
environment:
TOXENV: py36-eth2-trio
TOXENV: py37-long_run_integration

py37-rpc-state-quadratic:
<<: *common
Expand Down Expand Up @@ -398,16 +320,14 @@ workflows:
test:
jobs:
# These tests are long, so should be started first to optimize for total suite run time
- py36-integration
- py36-wheel-cli
- py37-integration
- py37-wheel-cli
- py36-long_run_integration
- py37-long_run_integration
- py37-rpc-state-sstore
- py36-eth2-core
- py37-eth2-core
- py37-libp2p

- py36-docs
- py37-docs

- py37-eth1-core
- py37-p2p
Expand All @@ -422,28 +342,17 @@ workflows:
- py37-rpc-state-quadratic
- py37-rpc-state-zero_knowledge

- py36-rpc-state-byzantium
- py36-rpc-state-constantinople
- py36-rpc-state-frontier
- py36-rpc-state-homestead
- py36-rpc-state-petersburg
- py36-rpc-state-spurious_dragon
- py36-rpc-state-tangerine_whistle
- py36-rpc-blockchain

- py36-eth1-core
- py36-p2p
- py36-p2p-trio
- py36-eth2-utils
- py36-eth2-fixtures
- py36-eth2-integration
- py36-eth1-components
- py36-eth2-trio
- py37-rpc-state-byzantium
- py37-rpc-state-constantinople
- py37-rpc-state-frontier
- py37-rpc-state-homestead
- py37-rpc-state-petersburg
- py37-rpc-state-spurious_dragon
- py37-rpc-state-tangerine_whistle
- py37-rpc-blockchain

- py36-lightchain_integration
- py37-lightchain_integration

- py36-lint
- py36-lint-eth2
- py37-lint
- py37-lint-eth2

Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
build:
image: latest
python:
version: 3.6
version: 3.7
install:
- method: pip
path: .
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/quickstart.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ To develop on top of Trinity or to contribute to the project, check out the
Installing on Ubuntu
--------------------

Trinity requires Python 3.6 as well as some tools to compile its dependencies. On Ubuntu, the
``python3.6-dev`` package contains everything we need. Run the following command to install it.
Trinity requires Python 3.7 as well as some tools to compile its dependencies. On Ubuntu, the
``python3.7-dev`` package contains everything we need. Run the following command to install it.

.. code:: sh
Expand Down
1 change: 1 addition & 0 deletions newsfragments/1675.removal.rst
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Drop support for Python 3.6 making Python 3.7 the minimal supported Python version.
4 changes: 2 additions & 2 deletions setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def filter_dependencies(package_list, *package_name):
url='https://github.com/ethereum/trinity',
include_package_data=True,
py_modules=['trinity', 'p2p', 'eth2'],
python_requires=">=3.6,<4",
python_requires=">=3.7,<4",
install_requires=install_requires,
extras_require=deps,
license='MIT',
Expand All @@ -200,7 +200,7 @@ def filter_dependencies(package_list, *package_name):
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'Natural Language :: English',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
],
# trinity
entry_points={
Expand Down
Loading

0 comments on commit da0eef1

Please sign in to comment.