|
21 | 21 | build_from_imports_py, |
22 | 22 | ) |
23 | 23 | from codegen.validators import ( |
24 | | - write_validator_py, |
| 24 | + get_data_validator_params, |
25 | 25 | get_validator_params, |
26 | 26 | write_validator_json, |
27 | | - write_data_validator_py, |
28 | 27 | get_data_validator_instance, |
29 | 28 | ) |
30 | 29 |
|
@@ -178,23 +177,22 @@ def perform_codegen(reformat=True): |
178 | 177 | # -------------------- |
179 | 178 | # # ### Layout ### |
180 | 179 | for node in all_layout_nodes: |
181 | | - # write_validator_py(outdir, node) |
182 | 180 | get_validator_params(node, validator_params) |
183 | 181 |
|
184 | 182 | # ### Trace ### |
185 | 183 | for node in all_trace_nodes: |
186 | | - # write_validator_py(outdir, node) |
187 | 184 | get_validator_params(node, validator_params) |
188 | 185 |
|
189 | 186 | # ### Frames ### |
190 | 187 | for node in all_frame_nodes: |
191 | | - # write_validator_py(outdir, node) |
192 | 188 | get_validator_params(node, validator_params) |
193 | | - |
| 189 | + |
| 190 | + # ### Data (traces) validator ### |
| 191 | + get_data_validator_params(base_traces_node, validator_params) |
| 192 | + |
| 193 | + # Write out the JSON data for the validators |
194 | 194 | os.makedirs(validators_pkgdir, exist_ok=True) |
195 | 195 | write_validator_json(outdir, validator_params) |
196 | | - # ### Data (traces) validator ### |
197 | | - write_data_validator_py(outdir, base_traces_node) |
198 | 196 |
|
199 | 197 | # Alls |
200 | 198 | # ---- |
@@ -225,27 +223,6 @@ def perform_codegen(reformat=True): |
225 | 223 | layout_array_nodes, |
226 | 224 | ) |
227 | 225 |
|
228 | | - # Write validator __init__.py files |
229 | | - # --------------------------------- |
230 | | - # ### Write __init__.py files for each validator package ### |
231 | | - validator_rel_class_imports = {} |
232 | | - for node in all_datatype_nodes: |
233 | | - if node.is_mapped: |
234 | | - continue |
235 | | - key = node.parent_path_parts |
236 | | - validator_rel_class_imports.setdefault(key, []).append( |
237 | | - f"._{node.name_property}.{node.name_validator_class}" |
238 | | - ) |
239 | | - |
240 | | - # Add Data validator |
241 | | - root_validator_pairs = validator_rel_class_imports[()] |
242 | | - root_validator_pairs.append("._data.DataValidator") |
243 | | - |
244 | | - # Output validator __init__.py files |
245 | | - validators_pkg = opath.join(outdir, "validators") |
246 | | - # for path_parts, rel_classes in validator_rel_class_imports.items(): |
247 | | - # write_init_py(validators_pkg, path_parts, [], rel_classes) |
248 | | - |
249 | 226 | # Write datatype __init__.py files |
250 | 227 | # -------------------------------- |
251 | 228 | datatype_rel_class_imports = {} |
|