Skip to content

Commit c220149

Browse files
pacrobpacrob
committed
merge template updates and fill template variables
2 parents 5accc9d + cb3f556 commit c220149

22 files changed

+516
-274
lines changed

‎.circleci/config.yml

+96-71
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 2.0
1+
version: 2.1
22

33
# heavily inspired by:
44
# https://raw.githubusercontent.com/pinax/pinax-wiki/6bd2a99ab6f702e300d708532a6d1d9aa638b9f8/.circleci/config.yml
@@ -14,7 +14,7 @@ common: &common
1414
# this is necessary until circleci images begin using openssl>=3.0.7
1515
name: update openssl.cnf for ripemd160
1616
command: |
17-
sudo tee -a /etc/ssl/openssl.cnf >/dev/null <<'EOF'
17+
sudo tee -a /etc/ssl/openssl.cnf >/dev/null \<<'EOF'
1818
1919
[openssl_init]
2020
providers = provider_sect
@@ -41,7 +41,7 @@ common: &common
4141
command: ./.circleci/merge_pr.sh
4242
when: on_fail
4343
- run:
44-
name: merge pull request base (3nd try)
44+
name: merge pull request base (3rd try)
4545
command: ./.circleci/merge_pr.sh
4646
when: on_fail
4747
- restore_cache:
@@ -52,19 +52,47 @@ common: &common
5252
command: |
5353
python -m pip install --upgrade pip
5454
python -m pip install tox
55+
- run:
56+
name: install pre-commit
57+
command: python -m pip install --progress-bar=off pre-commit
5558
- run:
5659
name: run tox
57-
command: python -m tox -r
60+
command: python -m tox run -r
5861
- save_cache:
5962
paths:
6063
- .hypothesis
6164
- .tox
6265
- ~/.cache/pip
6366
- ~/.local
64-
- ./eggs
6567
key: cache-v1-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
6668
resource_class: xlarge
6769

70+
orbs:
71+
win: circleci/[email protected]
72+
73+
windows_steps: &windows_steps
74+
executor:
75+
name: win/default
76+
shell: bash.exe
77+
working_directory: C:\Users\circleci\project\py-evm
78+
steps:
79+
- checkout
80+
- restore_cache:
81+
keys:
82+
- cache-v1-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
83+
- run:
84+
name: install dependencies
85+
command: |
86+
python -m pip install --upgrade pip
87+
python -m pip install tox
88+
- run:
89+
name: run tox
90+
command: python -m tox run -r
91+
- save_cache:
92+
paths:
93+
- .tox
94+
key: cache-v1-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
95+
6896
jobs:
6997
docs:
7098
<<: *common
@@ -127,61 +155,30 @@ jobs:
127155
- image: cimg/python:3.11
128156
environment:
129157
TOXENV: py311-native-blockchain-petersburg
130-
py311-native-blockchain-tangerine_whistle:
158+
py311-native-blockchain-shanghai:
131159
<<: *common
132160
docker:
133161
- image: cimg/python:3.11
134162
environment:
135-
TOXENV: py311-native-blockchain-tangerine_whistle
163+
TOXENV: py311-native-blockchain-shanghai
136164
py311-native-blockchain-spurious_dragon:
137165
<<: *common
138166
docker:
139167
- image: cimg/python:3.11
140168
environment:
141169
TOXENV: py311-native-blockchain-spurious_dragon
142-
py311-native-blockchain-transition:
170+
py311-native-blockchain-tangerine_whistle:
143171
<<: *common
144172
docker:
145173
- image: cimg/python:3.11
146174
environment:
147-
TOXENV: py311-native-blockchain-transition
148-
py311-native-blockchain-shanghai:
175+
TOXENV: py311-native-blockchain-tangerine_whistle
176+
py311-native-blockchain-transition:
149177
<<: *common
150178
docker:
151179
- image: cimg/python:3.11
152180
environment:
153-
TOXENV: py311-native-blockchain-shanghai
154-
155-
py37-core:
156-
<<: *common
157-
docker:
158-
- image: cimg/python:3.7
159-
environment:
160-
TOXENV: py37-core
161-
py37-database:
162-
<<: *common
163-
docker:
164-
- image: cimg/python:3.7
165-
environment:
166-
TOXENV: py37-database
167-
py37-difficulty:
168-
<<: *common
169-
docker:
170-
- image: cimg/python:3.7
171-
environment:
172-
TOXENV: py37-difficulty
173-
py37-transactions:
174-
<<: *common
175-
docker:
176-
- image: cimg/python:3.7
177-
environment:
178-
TOXENV: py37-transactions
179-
py37-vm:
180-
<<: *common
181-
docker:
182-
- image: cimg/python:3.7
183-
environment:
184-
TOXENV: py37-vm
181+
TOXENV: py311-native-blockchain-transition
185182

186183
py38-core:
187184
<<: *common
@@ -201,6 +198,12 @@ jobs:
201198
- image: cimg/python:3.8
202199
environment:
203200
TOXENV: py38-difficulty
201+
py38-lint:
202+
<<: *common
203+
docker:
204+
- image: cimg/python:3.8
205+
environment:
206+
TOXENV: py38-lint
204207
py38-transactions:
205208
<<: *common
206209
docker:
@@ -213,12 +216,12 @@ jobs:
213216
- image: cimg/python:3.8
214217
environment:
215218
TOXENV: py38-vm
216-
py38-lint:
219+
py38-wheel:
217220
<<: *common
218221
docker:
219222
- image: cimg/python:3.8
220223
environment:
221-
TOXENV: py38-lint
224+
TOXENV: py38-wheel
222225

223226
py39-core:
224227
<<: *common
@@ -238,6 +241,12 @@ jobs:
238241
- image: cimg/python:3.9
239242
environment:
240243
TOXENV: py39-difficulty
244+
py39-lint:
245+
<<: *common
246+
docker:
247+
- image: cimg/python:3.9
248+
environment:
249+
TOXENV: py39-lint
241250
py39-transactions:
242251
<<: *common
243252
docker:
@@ -250,12 +259,12 @@ jobs:
250259
- image: cimg/python:3.9
251260
environment:
252261
TOXENV: py39-vm
253-
py39-lint:
262+
py39-wheel:
254263
<<: *common
255264
docker:
256265
- image: cimg/python:3.9
257266
environment:
258-
TOXENV: py39-lint
267+
TOXENV: py39-wheel
259268

260269
py310-core:
261270
<<: *common
@@ -275,6 +284,12 @@ jobs:
275284
- image: cimg/python:3.10
276285
environment:
277286
TOXENV: py310-difficulty
287+
py310-lint:
288+
<<: *common
289+
docker:
290+
- image: cimg/python:3.10
291+
environment:
292+
TOXENV: py310-lint
278293
py310-transactions:
279294
<<: *common
280295
docker:
@@ -287,12 +302,12 @@ jobs:
287302
- image: cimg/python:3.10
288303
environment:
289304
TOXENV: py310-vm
290-
py310-lint:
305+
py310-wheel:
291306
<<: *common
292307
docker:
293308
- image: cimg/python:3.10
294309
environment:
295-
TOXENV: py310-lint
310+
TOXENV: py310-wheel
296311

297312
py311-core:
298313
<<: *common
@@ -312,6 +327,12 @@ jobs:
312327
- image: cimg/python:3.11
313328
environment:
314329
TOXENV: py311-difficulty
330+
py311-lint:
331+
<<: *common
332+
docker:
333+
- image: cimg/python:3.11
334+
environment:
335+
TOXENV: py311-lint
315336
py311-transactions:
316337
<<: *common
317338
docker:
@@ -324,57 +345,61 @@ jobs:
324345
- image: cimg/python:3.11
325346
environment:
326347
TOXENV: py311-vm
327-
py311-lint:
348+
py311-wheel:
328349
<<: *common
329350
docker:
330351
- image: cimg/python:3.11
331352
environment:
332-
TOXENV: py311-lint
353+
TOXENV: py311-wheel
354+
py311-wheel-windows:
355+
<<: *windows_steps
356+
environment:
357+
TOXENV: py311-wheel-windows
333358

334359
workflows:
335360
version: 2
336361
test:
337362
jobs:
338363
- docs
339-
- py311-native-blockchain-shanghai
340-
- py311-native-blockchain-merge
341-
- py311-native-blockchain-london
342364
- py311-native-blockchain-berlin
343365
- py311-native-blockchain-byzantium
344366
- py311-native-blockchain-constantinople
345367
- py311-native-blockchain-frontier
346368
- py311-native-blockchain-homestead
347369
- py311-native-blockchain-istanbul
370+
- py311-native-blockchain-london
371+
- py311-native-blockchain-merge
348372
- py311-native-blockchain-petersburg
349-
- py311-native-blockchain-tangerine_whistle
373+
- py311-native-blockchain-shanghai
350374
- py311-native-blockchain-spurious_dragon
375+
- py311-native-blockchain-tangerine_whistle
351376
- py311-native-blockchain-transition
352-
- py37-vm
353-
- py38-vm
354-
- py39-vm
355-
- py310-vm
356-
- py311-vm
357-
- py37-core
358377
- py38-core
359378
- py39-core
360379
- py310-core
361380
- py311-core
362-
- py37-transactions
363-
- py38-transactions
364-
- py39-transactions
365-
- py310-transactions
366-
- py311-transactions
367-
- py37-difficulty
368-
- py38-difficulty
369-
- py39-difficulty
370-
- py310-difficulty
371-
- py311-difficulty
372-
- py37-database
373381
- py38-database
374382
- py39-database
375383
- py310-database
376384
- py311-database
385+
- py38-difficulty
386+
- py39-difficulty
387+
- py310-difficulty
388+
- py311-difficulty
377389
- py38-lint
378390
- py39-lint
379391
- py310-lint
380392
- py311-lint
393+
- py38-transactions
394+
- py39-transactions
395+
- py310-transactions
396+
- py311-transactions
397+
- py38-vm
398+
- py39-vm
399+
- py310-vm
400+
- py311-vm
401+
- py38-wheel
402+
- py39-wheel
403+
- py310-wheel
404+
- py311-wheel
405+
- py311-wheel-windows

‎.github/ISSUE_TEMPLATE/bug_report.yaml

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: Bug Report
2+
description: File a bug report
3+
labels: ["bug"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: "## What was wrong"
8+
- type: textarea
9+
id: what-happened
10+
attributes:
11+
label: What happened?
12+
description: Also tell us what you expected to happen
13+
validations:
14+
required: true
15+
- type: textarea
16+
id: code-that-caused
17+
attributes:
18+
label: Code that produced the error
19+
description: Formats to Python, no backticks needed
20+
render: python
21+
validations:
22+
required: false
23+
- type: textarea
24+
id: error-output
25+
attributes:
26+
label: Full error output
27+
description: Formats to shell, no backticks needed
28+
render: shell
29+
validations:
30+
required: false
31+
- type: markdown
32+
attributes:
33+
value: "## Potential Solutions"
34+
- type: textarea
35+
id: how-to-fix
36+
attributes:
37+
label: Fill this section in if you know how this could or should be fixed
38+
description: Include any relevant examples or reference material
39+
validations:
40+
required: false
41+
- type: input
42+
id: lib-version
43+
attributes:
44+
label: py-evm Version
45+
description: Which version of py-evm are you using?
46+
placeholder: x.x.x
47+
validations:
48+
required: false
49+
- type: input
50+
id: py-version
51+
attributes:
52+
label: Python Version
53+
description: Which version of Python are you using?
54+
placeholder: x.x.x
55+
validations:
56+
required: false
57+
- type: input
58+
id: os
59+
attributes:
60+
label: Operating System
61+
description: Which operating system are you using?
62+
placeholder: osx/linux/win
63+
validations:
64+
required: false
65+
- type: textarea
66+
id: pip-freeze
67+
attributes:
68+
label: Output from `pip freeze`
69+
description: Run `python -m pip freeze` and paste the output below
70+
render: shell
71+
validations:
72+
required: false

0 commit comments

Comments
 (0)