From 1f3166018d468b15cb2755c8faaf4fdb0ce80346 Mon Sep 17 00:00:00 2001 From: Christoph Burgdorf Date: Wed, 27 May 2020 10:21:37 +0200 Subject: [PATCH] PR feedback --- .circleci/config.yml | 95 ++++++++++++++++++++++---------------------- setup.py | 1 + tox.ini | 10 ++--- 3 files changed, 54 insertions(+), 52 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7b33fdfd83..1b70747ea6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -138,68 +138,68 @@ jobs: environment: TOXENV: py37-lint-eth2 - py38-docs: + py37-docs: <<: *common docker: - - image: circleci/python:3.8 + - image: circleci/python:3.7 environment: - TOXENV: py38-docs + TOXENV: py37-docs - py38-rpc-state-byzantium: + py37-rpc-state-byzantium: <<: *common docker: - - image: circleci/python:3.8 + - image: circleci/python:3.7 environment: - TOXENV: py38-rpc-state-byzantium - py38-rpc-state-constantinople: + TOXENV: py37-rpc-state-byzantium + py37-rpc-state-constantinople: <<: *common docker: - - image: circleci/python:3.8 + - image: circleci/python:3.7 environment: - TOXENV: py38-rpc-state-constantinople - py38-rpc-state-frontier: + TOXENV: py37-rpc-state-constantinople + py37-rpc-state-frontier: <<: *common docker: - - image: circleci/python:3.8 + - image: circleci/python:3.7 environment: - TOXENV: py38-rpc-state-frontier - py38-rpc-state-homestead: + TOXENV: py37-rpc-state-frontier + py37-rpc-state-homestead: <<: *common docker: - - image: circleci/python:3.8 + - image: circleci/python:3.7 environment: - TOXENV: py38-rpc-state-homestead - py38-rpc-state-istanbul: + TOXENV: py37-rpc-state-homestead + py37-rpc-state-istanbul: <<: *common docker: - - image: circleci/python:3.8 + - image: circleci/python:3.7 environment: - TOXENV: py38-rpc-state-istanbul - py38-rpc-state-petersburg: + TOXENV: py37-rpc-state-istanbul + py37-rpc-state-petersburg: <<: *common docker: - - image: circleci/python:3.8 + - image: circleci/python:3.7 environment: - TOXENV: py38-rpc-state-petersburg + TOXENV: py37-rpc-state-petersburg - py38-rpc-state-tangerine_whistle: + py37-rpc-state-tangerine_whistle: <<: *common docker: - - image: circleci/python:3.8 + - image: circleci/python:3.7 environment: - TOXENV: py38-rpc-state-tangerine_whistle - py38-rpc-state-spurious_dragon: + TOXENV: py37-rpc-state-tangerine_whistle + py37-rpc-state-spurious_dragon: <<: *common docker: - - image: circleci/python:3.8 + - image: circleci/python:3.7 environment: - TOXENV: py38-rpc-state-spurious_dragon - py38-rpc-blockchain: + TOXENV: py37-rpc-state-spurious_dragon + py37-rpc-blockchain: <<: *common docker: - - image: circleci/python:3.8 + - image: circleci/python:3.7 environment: - TOXENV: py38-rpc-blockchain + TOXENV: py37-rpc-blockchain py38-eth1-core: <<: *common @@ -213,19 +213,19 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-integration - py38-lightchain_integration: + py37-lightchain_integration: <<: *geth_steps docker: - - image: circleci/python:3.8 + - image: circleci/python:3.7 environment: - TOXENV: py38-lightchain_integration + TOXENV: py37-lightchain_integration GETH_VERSION: v1.8.22 - py38-long_run_integration: + py37-long_run_integration: <<: *common docker: - - image: circleci/python:3.8 + - image: circleci/python:3.7 environment: - TOXENV: py38-long_run_integration + TOXENV: py37-long_run_integration py38-p2p: <<: *common docker: @@ -399,15 +399,16 @@ workflows: jobs: # These tests are long, so should be started first to optimize for total suite run time - py38-integration + - py37-integration - py38-wheel-cli - py37-wheel-cli - - py38-long_run_integration + - py37-long_run_integration - py37-rpc-state-sstore - py38-eth2-core - py37-eth2-core - py37-libp2p - - py38-docs + - py37-docs - py37-eth1-core - py37-p2p @@ -422,14 +423,14 @@ workflows: - py37-rpc-state-quadratic - py37-rpc-state-zero_knowledge - - py38-rpc-state-byzantium - - py38-rpc-state-constantinople - - py38-rpc-state-frontier - - py38-rpc-state-homestead - - py38-rpc-state-petersburg - - py38-rpc-state-spurious_dragon - - py38-rpc-state-tangerine_whistle - - py38-rpc-blockchain + - 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 - py38-eth1-core - py38-p2p @@ -440,7 +441,7 @@ workflows: - py38-eth1-components - py38-eth2-trio - - py38-lightchain_integration + - py37-lightchain_integration - py38-lint - py38-lint-eth2 diff --git a/setup.py b/setup.py index 1d6d04679e..cd59c9d42f 100644 --- a/setup.py +++ b/setup.py @@ -198,6 +198,7 @@ def filter_dependencies(package_list, *package_name): 'License :: OSI Approved :: MIT License', 'Natural Language :: English', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', ], # trinity entry_points={ diff --git a/tox.ini b/tox.ini index f0b135e299..6da61717c9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,15 @@ [tox] envlist= py{37,38}-{eth1-core,p2p,p2p-trio,integration,lightchain_integration,eth2-core,eth2-fixtures,eth2-integration,eth1-components,eth2-utils,eth2-trio} - py38-long_run_integration - py38-rpc-blockchain + py37-long_run_integration + py37-rpc-blockchain py38-rpc-state-{frontier,homestead,tangerine_whistle,spurious_dragon,byzantium,constantinople,petersburg,istanbul} py37-rpc-state-{quadratic,sstore,zero_knowledge} py37-{libp2p,eth2-components} py{38,37}-lint py{38,37}-lint-eth2 py{38,37}-wheel-cli - py38-docs + py37-docs [flake8] max-line-length= 100 @@ -79,7 +79,7 @@ commands = pytest -n 4 {posargs:tests-trio/eth2} {posargs:tests-trio/trinity} {p deps = .[eth2,trinity,test,test-trio] commands = pytest -n 4 {posargs:tests-trio/eth2} {posargs:tests-trio/trinity} {posargs:tests-trio/integration} -[testenv:py38-docs] +[testenv:py37-docs] whitelist_externals= make deps = .[p2p, trinity, eth2, doc] @@ -141,7 +141,7 @@ deps = {[common-integration]deps} passenv = {[common-integration]passenv} commands = {[common-integration]commands} -[testenv:py38-long_run_integration] +[testenv:py37-long_run_integration] deps = {[common-integration]deps} passenv = {[common-integration]passenv} commands =