Skip to content

Commit fa0ee2c

Browse files
authored
Merge pull request #23097 from github/nickrolfe/model-generator-default-json
modelgenerator: default to generating JSON
2 parents 9aade85 + 29cfb3a commit fa0ee2c

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎misc/scripts/models-as-data/bulk_generate_mad.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ def main(config, args) -> None:
548548
parser.add_argument(
549549
"--extension-format",
550550
choices=["json", "yaml"],
551-
default="yaml",
551+
default="json",
552552
help="Format for the generated data extension files (default %(default)s)",
553553
)
554554
args = parser.parse_args()

‎misc/scripts/models-as-data/convert_extensions.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ def __init__(self, language, dbDir):
1919
)
2020
self.extDir = os.path.join(self.codeQlRoot, f"{self.language}/ql/lib/ext/")
2121
self.dirname = "modelconverter"
22-
# N.B. change this to .model.json to change the output format:
23-
self.modelFileExtension = ".model.yml"
22+
# N.B. change this to .model.yml to change the output format:
23+
self.modelFileExtension = ".model.json"
2424
self.workDir = tempfile.mkdtemp()
2525

2626
def runQuery(self, query):

‎misc/scripts/models-as-data/generate_mad.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Generator:
3333
threads = 0
3434
folder = ""
3535
single_file = None
36-
extension_format = "yaml"
36+
extension_format = "json"
3737

3838
def __init__(self, language=None):
3939
self.language = language
@@ -123,7 +123,7 @@ def make():
123123
p.add_argument(
124124
"--extension-format",
125125
choices=["json", "yaml"],
126-
default="yaml",
126+
default="json",
127127
help="Format for the generated data extension files (default %(default)s)",
128128
)
129129
generator = p.parse_args(namespace=Generator())

0 commit comments

Comments
 (0)