Skip to content

Commit f77ea3f

Browse files
authored
Read release name from release config file. (#4567)
These changes complements the changes introduced in #4565
1 parent ffc5d33 commit f77ea3f

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

docs/make_release_notes.py

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def get_header(self):
4343

4444
def get_ktx_header(self):
4545
if not self.has_ktx:
46-
return ""
46+
return ''
4747
version_str = f'{{: #{self.version_name}-ktx_v{self.version.replace(".", "-")}}}'
4848
return f'### {self.alt_name} Kotlin extensions version {self.version} {version_str}\n'
4949

@@ -211,16 +211,17 @@ def _get_version(self):
211211
alt_name='{{app_check}} SafetyNet',
212212
version_name='appcheck-safetynet')
213213
}
214-
KTX_PLACEHOLDER_TEXT = """
214+
KTX_PLACEHOLDER_TEXT = """
215215
The Kotlin extensions library transitively includes the updated
216216
`PLACEHOLDER_NAME` library. The Kotlin extensions library has no additional
217217
updates.
218218
"""
219219

220-
def releasing_products(release_cfg_path):
220+
221+
def read_release_cfg(release_cfg_path):
221222
config = configparser.ConfigParser(allow_no_value=True, delimiters=('=',))
222223
config.read(release_cfg_path)
223-
return list(config['modules'])
224+
return config
224225

225226

226227
def main():
@@ -233,15 +234,24 @@ def main():
233234
required=False,
234235
help='Comma separated list of products to process')
235236
parser.add_argument('--generated_name',
236-
default='changelog',
237237
required=False,
238+
default=None,
238239
help='Name for generated files, without extension.')
239240
args = parser.parse_args()
240241

242+
release_cfg = None
243+
if os.path.exists(args.releasecfg):
244+
release_cfg = read_release_cfg(args.releasecfg)
245+
241246
if args.products:
242247
products = args.products.split(',')
243248
else:
244-
products = releasing_products(args.releasecfg)
249+
products = list(release_cfg['modules'])
250+
251+
if args.generated_name:
252+
generated_name = args.generated_name
253+
else:
254+
generated_name = release_cfg['release']['name'].lower().strip()
245255

246256
for product in products:
247257
if product.startswith(':'):
@@ -255,7 +265,7 @@ def main():
255265
translator = Translator(renderer)
256266
path = f'build/changelog/android/client/{changelog.target_path}/_releases'
257267
os.makedirs(path, exist_ok=True)
258-
with open(f'{path}/{args.generated_name}.md', 'w') as fd:
268+
with open(f'{path}/{generated_name}.md', 'w') as fd:
259269
fd.write(
260270
translator.translate(
261271
read_changelog_section(changelog, 'Unreleased')))
@@ -434,7 +444,9 @@ def read_changelog_section(changelog, single_version=None):
434444
if changelog.has_ktx:
435445
result.append('\n')
436446
result.append(changelog.get_ktx_header())
437-
result.append(KTX_PLACEHOLDER_TEXT.replace('PLACEHOLDER_NAME', changelog.ktx_placeholder))
447+
result.append(
448+
KTX_PLACEHOLDER_TEXT.replace('PLACEHOLDER_NAME',
449+
changelog.ktx_placeholder))
438450

439451
return ''.join(result)
440452

0 commit comments

Comments
 (0)