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

Commit 61fd1c1

Browse files
committed
PR feedback
1 parent f4f82ec commit 61fd1c1

File tree

3 files changed

+55
-52
lines changed

3 files changed

+55
-52
lines changed

.circleci/config.yml

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -138,68 +138,68 @@ jobs:
138138
environment:
139139
TOXENV: py37-lint-eth2
140140

141-
py38-docs:
141+
py37-docs:
142142
<<: *common
143143
docker:
144-
- image: circleci/python:3.8
144+
- image: circleci/python:3.7
145145
environment:
146-
TOXENV: py38-docs
146+
TOXENV: py37-docs
147147

148-
py38-rpc-state-byzantium:
148+
py37-rpc-state-byzantium:
149149
<<: *common
150150
docker:
151-
- image: circleci/python:3.8
151+
- image: circleci/python:3.7
152152
environment:
153-
TOXENV: py38-rpc-state-byzantium
154-
py38-rpc-state-constantinople:
153+
TOXENV: py37-rpc-state-byzantium
154+
py37-rpc-state-constantinople:
155155
<<: *common
156156
docker:
157-
- image: circleci/python:3.8
157+
- image: circleci/python:3.7
158158
environment:
159-
TOXENV: py38-rpc-state-constantinople
160-
py38-rpc-state-frontier:
159+
TOXENV: py37-rpc-state-constantinople
160+
py37-rpc-state-frontier:
161161
<<: *common
162162
docker:
163-
- image: circleci/python:3.8
163+
- image: circleci/python:3.7
164164
environment:
165-
TOXENV: py38-rpc-state-frontier
166-
py38-rpc-state-homestead:
165+
TOXENV: py37-rpc-state-frontier
166+
py37-rpc-state-homestead:
167167
<<: *common
168168
docker:
169-
- image: circleci/python:3.8
169+
- image: circleci/python:3.7
170170
environment:
171-
TOXENV: py38-rpc-state-homestead
172-
py38-rpc-state-istanbul:
171+
TOXENV: py37-rpc-state-homestead
172+
py37-rpc-state-istanbul:
173173
<<: *common
174174
docker:
175-
- image: circleci/python:3.8
175+
- image: circleci/python:3.7
176176
environment:
177-
TOXENV: py38-rpc-state-istanbul
178-
py38-rpc-state-petersburg:
177+
TOXENV: py37-rpc-state-istanbul
178+
py37-rpc-state-petersburg:
179179
<<: *common
180180
docker:
181-
- image: circleci/python:3.8
181+
- image: circleci/python:3.7
182182
environment:
183-
TOXENV: py38-rpc-state-petersburg
183+
TOXENV: py37-rpc-state-petersburg
184184

185-
py38-rpc-state-tangerine_whistle:
185+
py37-rpc-state-tangerine_whistle:
186186
<<: *common
187187
docker:
188-
- image: circleci/python:3.8
188+
- image: circleci/python:3.7
189189
environment:
190-
TOXENV: py38-rpc-state-tangerine_whistle
191-
py38-rpc-state-spurious_dragon:
190+
TOXENV: py37-rpc-state-tangerine_whistle
191+
py37-rpc-state-spurious_dragon:
192192
<<: *common
193193
docker:
194-
- image: circleci/python:3.8
194+
- image: circleci/python:3.7
195195
environment:
196-
TOXENV: py38-rpc-state-spurious_dragon
197-
py38-rpc-blockchain:
196+
TOXENV: py37-rpc-state-spurious_dragon
197+
py37-rpc-blockchain:
198198
<<: *common
199199
docker:
200-
- image: circleci/python:3.8
200+
- image: circleci/python:3.7
201201
environment:
202-
TOXENV: py38-rpc-blockchain
202+
TOXENV: py37-rpc-blockchain
203203

204204
py38-eth1-core:
205205
<<: *common
@@ -213,19 +213,19 @@ jobs:
213213
- image: circleci/python:3.8
214214
environment:
215215
TOXENV: py38-integration
216-
py38-lightchain_integration:
216+
py37-lightchain_integration:
217217
<<: *geth_steps
218218
docker:
219-
- image: circleci/python:3.8
219+
- image: circleci/python:3.7
220220
environment:
221-
TOXENV: py38-lightchain_integration
221+
TOXENV: py37-lightchain_integration
222222
GETH_VERSION: v1.8.22
223-
py38-long_run_integration:
223+
py37-long_run_integration:
224224
<<: *common
225225
docker:
226-
- image: circleci/python:3.8
226+
- image: circleci/python:3.7
227227
environment:
228-
TOXENV: py38-long_run_integration
228+
TOXENV: py37-long_run_integration
229229
py38-p2p:
230230
<<: *common
231231
docker:
@@ -399,15 +399,16 @@ workflows:
399399
jobs:
400400
# These tests are long, so should be started first to optimize for total suite run time
401401
- py38-integration
402+
- py37-integration
402403
- py38-wheel-cli
403404
- py37-wheel-cli
404-
- py38-long_run_integration
405+
- py37-long_run_integration
405406
- py37-rpc-state-sstore
406407
- py38-eth2-core
407408
- py37-eth2-core
408409
- py37-libp2p
409410

410-
- py38-docs
411+
- py37-docs
411412

412413
- py37-eth1-core
413414
- py37-p2p
@@ -422,14 +423,15 @@ workflows:
422423
- py37-rpc-state-quadratic
423424
- py37-rpc-state-zero_knowledge
424425

425-
- py38-rpc-state-byzantium
426-
- py38-rpc-state-constantinople
427-
- py38-rpc-state-frontier
428-
- py38-rpc-state-homestead
429-
- py38-rpc-state-petersburg
430-
- py38-rpc-state-spurious_dragon
431-
- py38-rpc-state-tangerine_whistle
432-
- py38-rpc-blockchain
426+
- py37-rpc-state-byzantium
427+
- py37-rpc-state-constantinople
428+
- py37-rpc-state-frontier
429+
- py37-rpc-state-homestead
430+
- py37-rpc-state-istanbul
431+
- py37-rpc-state-petersburg
432+
- py37-rpc-state-spurious_dragon
433+
- py37-rpc-state-tangerine_whistle
434+
- py37-rpc-blockchain
433435

434436
- py38-eth1-core
435437
- py38-p2p
@@ -440,7 +442,7 @@ workflows:
440442
- py38-eth1-components
441443
- py38-eth2-trio
442444

443-
- py38-lightchain_integration
445+
- py37-lightchain_integration
444446

445447
- py38-lint
446448
- py38-lint-eth2

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ def filter_dependencies(package_list, *package_name):
198198
'License :: OSI Approved :: MIT License',
199199
'Natural Language :: English',
200200
'Programming Language :: Python :: 3.7',
201+
'Programming Language :: Python :: 3.8',
201202
],
202203
# trinity
203204
entry_points={

tox.ini

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[tox]
22
envlist=
33
py{37,38}-{eth1-core,p2p,p2p-trio,integration,lightchain_integration,eth2-core,eth2-fixtures,eth2-integration,eth1-components,eth2-utils,eth2-trio}
4-
py38-long_run_integration
5-
py38-rpc-blockchain
4+
py37-long_run_integration
5+
py37-rpc-blockchain
66
py38-rpc-state-{frontier,homestead,tangerine_whistle,spurious_dragon,byzantium,constantinople,petersburg,istanbul}
77
py37-rpc-state-{quadratic,sstore,zero_knowledge}
88
py37-{libp2p,eth2-components}
99
py{38,37}-lint
1010
py{38,37}-lint-eth2
1111
py{38,37}-wheel-cli
12-
py38-docs
12+
py37-docs
1313

1414
[flake8]
1515
max-line-length= 100
@@ -79,7 +79,7 @@ commands = pytest -n 4 {posargs:tests-trio/eth2} {posargs:tests-trio/trinity} {p
7979
deps = .[eth2,trinity,test,test-trio]
8080
commands = pytest -n 4 {posargs:tests-trio/eth2} {posargs:tests-trio/trinity} {posargs:tests-trio/integration}
8181

82-
[testenv:py38-docs]
82+
[testenv:py37-docs]
8383
whitelist_externals=
8484
make
8585
deps = .[p2p, trinity, eth2, doc]
@@ -141,7 +141,7 @@ deps = {[common-integration]deps}
141141
passenv = {[common-integration]passenv}
142142
commands = {[common-integration]commands}
143143

144-
[testenv:py38-long_run_integration]
144+
[testenv:py37-long_run_integration]
145145
deps = {[common-integration]deps}
146146
passenv = {[common-integration]passenv}
147147
commands =

0 commit comments

Comments
 (0)