Commit 56aac4e
committed
fix(schema): pydantic v1 compatibility for the 3.10 dependency line
The release compat job (Python 3.10, where ray==2.0.0 pins pydantic v1)
caught two v2-only idioms that landed after v1.1.1 — the tag-gated job
is the first thing that exercises that half of the matrix:
- BodyNode.arguments forward-references PyCallArgument (#120); v1
resolves string annotations only when told to, so the module now
calls update_forward_refs on v1 (v2 rebuilds automatically and its
shim rejects localns, hence the guard).
- merge_edges copied edges with model_copy(); routed through a new
model_copy() compat helper alongside the existing model_dump_json
one, and the CLI's raw artifacts.model_dump(mode="json") now goes
through a model_dump() helper that maps mode=json onto a v1
json-round-trip.
Verified on Python 3.10 + pydantic 1.10.26 locally: all 60 tests from
the failing families pass; the only local residue is ray 2.0.0's
x86_64 grpc wheel refusing Apple Silicon in subprocess tests, which
does not affect the ubuntu runners. Python 3.12 + pydantic v2: 291
passed solo (a concurrent-run '2 failed' reproduced as machine-load
flakiness, not code).1 parent 341fea1 commit 56aac4e
4 files changed
Lines changed: 33 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| |||
368 | 368 | | |
369 | 369 | | |
370 | 370 | | |
371 | | - | |
| 371 | + | |
372 | 372 | | |
373 | 373 | | |
374 | 374 | | |
| |||
384 | 384 | | |
385 | 385 | | |
386 | 386 | | |
387 | | - | |
| 387 | + | |
388 | 388 | | |
389 | 389 | | |
390 | 390 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
107 | 128 | | |
108 | 129 | | |
109 | 130 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
308 | 308 | | |
309 | 309 | | |
310 | 310 | | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
311 | 318 | | |
312 | 319 | | |
313 | 320 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| 32 | + | |
32 | 33 | | |
33 | 34 | | |
34 | 35 | | |
| |||
295 | 296 | | |
296 | 297 | | |
297 | 298 | | |
298 | | - | |
| 299 | + | |
299 | 300 | | |
0 commit comments