@@ -132,8 +132,14 @@ def update_servicemetadata(sdk_folder, data, config, folder_name, package_name,
132
132
_LOGGER .info (f"Fail to save metadata since package folder doesn't exist: { package_folder } " )
133
133
return
134
134
for_swagger_gen = "meta" in config
135
- metadata_folder = package_folder / "_meta.json"
136
- if metadata_folder .exists () and for_swagger_gen :
135
+ # remove old _meta.json
136
+ old_metadata_folder = package_folder / "_meta.json"
137
+ if old_metadata_folder .exists ():
138
+ os .remove (old_metadata_folder )
139
+ _LOGGER .info (f"Remove old metadata file: { old_metadata_folder } " )
140
+
141
+ metadata_folder = package_folder / "_metadata.json"
142
+ if metadata_folder .exists ():
137
143
with open (metadata_folder , "r" ) as file_in :
138
144
metadata = json .load (file_in )
139
145
else :
@@ -172,31 +178,11 @@ def update_servicemetadata(sdk_folder, data, config, folder_name, package_name,
172
178
173
179
_LOGGER .info ("Metadata json:\n {}" .format (json .dumps (metadata , indent = 2 )))
174
180
175
- metadata_file_path = os . path . join ( package_folder , "_meta .json")
176
- with open (metadata_file_path , "w" ) as writer :
181
+ metadata_file_path = package_folder / "_metadata .json"
182
+ with metadata_file_path . open ("w" ) as writer :
177
183
json .dump (metadata , writer , indent = 2 )
178
184
_LOGGER .info (f"Saved metadata to { metadata_file_path } " )
179
185
180
- # Check whether MANIFEST.in includes _meta.json
181
- if "resource-manager" in input_readme :
182
- require_meta = "include _meta.json\n "
183
- manifest_file = os .path .join (package_folder , "MANIFEST.in" )
184
- if not os .path .exists (manifest_file ):
185
- _LOGGER .info (f"MANIFEST.in doesn't exist: { manifest_file } " )
186
- return
187
-
188
- includes = []
189
- write_flag = False
190
- with open (manifest_file , "r" ) as f :
191
- includes = f .readlines ()
192
- if require_meta not in includes :
193
- includes = [require_meta ] + includes
194
- write_flag = True
195
-
196
- if write_flag :
197
- with open (manifest_file , "w" ) as f :
198
- f .write ("" .join (includes ))
199
-
200
186
201
187
@return_origin_path
202
188
def judge_tag_preview (path : str , package_name : str ) -> bool :
@@ -462,8 +448,8 @@ def gen_typespec(
462
448
463
449
with open (Path ("eng/emitter-package.json" ), "r" ) as file_in :
464
450
data = json .load (file_in )
465
- npm_package_verstion = {
466
- typespec_python : data ["dependencies" ][typespec_python ],
451
+ npm_package_version = {
452
+ "emitterVersion" : data ["dependencies" ][typespec_python ],
467
453
}
468
454
469
- return npm_package_verstion
455
+ return npm_package_version
0 commit comments