@@ -79,7 +79,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False):
79
79
if e .errno == errno .ENOENT :
80
80
continue
81
81
if verbose :
82
- print ("unable to run {dispcmd}" . format ( dispcmd = dispcmd ) )
82
+ print (f "unable to run { dispcmd } " )
83
83
print (e )
84
84
return None
85
85
else :
@@ -89,7 +89,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False):
89
89
stdout = p .communicate ()[0 ].strip ().decode ()
90
90
if p .returncode != 0 :
91
91
if verbose :
92
- print ("unable to run {dispcmd} (error)" . format ( dispcmd = dispcmd ) )
92
+ print (f "unable to run { dispcmd } (error)" )
93
93
return None
94
94
return stdout
95
95
@@ -101,10 +101,7 @@ def versions_from_parentdir(parentdir_prefix, root, verbose):
101
101
if not dirname .startswith (parentdir_prefix ):
102
102
if verbose :
103
103
print (
104
- "guessing rootdir is '{root}', but '{dirname}' "
105
- "doesn't start with prefix '{parentdir_prefix}'" .format (
106
- root = root , dirname = dirname , parentdir_prefix = parentdir_prefix
107
- )
104
+ f"guessing rootdir is '{ root } ', but '{ dirname } ' doesn't start with prefix '{ parentdir_prefix } '"
108
105
)
109
106
raise NotThisMethod ("rootdir doesn't start with parentdir_prefix" )
110
107
return {
@@ -163,15 +160,15 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
163
160
# "stabilization", as well as "HEAD" and "master".
164
161
tags = {r for r in refs if re .search (r"\d" , r )}
165
162
if verbose :
166
- print ("discarding '{}', no digits" . format ( "," . join (refs - tags )) )
163
+ print (f "discarding '{ ',' . join (refs - tags )} ', no digits" )
167
164
if verbose :
168
- print ("likely tags: {}" . format ( "," .join (sorted (tags ))) )
165
+ print (f "likely tags: { ',' .join (sorted (tags ))} " )
169
166
for ref in sorted (tags ):
170
167
# sorting will prefer e.g. "2.0" over "2.0rc1"
171
168
if ref .startswith (tag_prefix ):
172
169
r = ref [len (tag_prefix ) :]
173
170
if verbose :
174
- print ("picking {r}" . format ( r = r ) )
171
+ print (f "picking { r } " )
175
172
return {
176
173
"version" : r ,
177
174
"full-revisionid" : keywords ["full" ].strip (),
@@ -198,7 +195,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
198
195
199
196
if not os .path .exists (os .path .join (root , ".git" )):
200
197
if verbose :
201
- print ("no .git in {root}" . format ( root = root ) )
198
+ print (f "no .git in { root } " )
202
199
raise NotThisMethod ("no .git directory" )
203
200
204
201
GITS = ["git" ]
@@ -240,17 +237,13 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
240
237
mo = re .search (r"^(.+)-(\d+)-g([0-9a-f]+)$" , git_describe )
241
238
if not mo :
242
239
# unparseable. Maybe git-describe is misbehaving?
243
- pieces ["error" ] = (
244
- "unable to parse git-describe output: "
245
- "'{describe_out}'" .format (describe_out = describe_out )
246
- )
240
+ pieces ["error" ] = f"unable to parse git-describe output: '{ describe_out } '"
247
241
return pieces
248
242
249
243
# tag
250
244
full_tag = mo .group (1 )
251
245
if not full_tag .startswith (tag_prefix ):
252
- fmt = "tag '{full_tag}' doesn't start with prefix '{tag_prefix}'"
253
- msg = fmt .format (full_tag = full_tag , tag_prefix = tag_prefix )
246
+ msg = f"tag '{ full_tag } ' doesn't start with prefix '{ tag_prefix } '"
254
247
if verbose :
255
248
print (msg )
256
249
pieces ["error" ] = msg
@@ -291,12 +284,12 @@ def render_pep440(pieces):
291
284
rendered = pieces ["closest-tag" ]
292
285
if pieces ["distance" ] or pieces ["dirty" ]:
293
286
rendered += plus_or_dot (pieces )
294
- rendered += "{ :d}.g{}" . format ( pieces ["distance" ], pieces [ " short" ])
287
+ rendered += f" { pieces [ 'distance' ] :d} .g{ pieces [' short' ] } "
295
288
if pieces ["dirty" ]:
296
289
rendered += ".dirty"
297
290
else :
298
291
# exception #1
299
- rendered = "0+untagged.{:d}.g{}" . format ( pieces ["distance" ], pieces [ " short" ])
292
+ rendered = f "0+untagged.{ pieces [ 'distance' ] :d} .g{ pieces [' short' ] } "
300
293
if pieces ["dirty" ]:
301
294
rendered += ".dirty"
302
295
return rendered
@@ -330,17 +323,17 @@ def render_pep440_post(pieces):
330
323
if pieces ["closest-tag" ]:
331
324
rendered = pieces ["closest-tag" ]
332
325
if pieces ["distance" ] or pieces ["dirty" ]:
333
- rendered += ".post{:d}" . format ( pieces [" distance" ])
326
+ rendered += f ".post{ pieces [' distance' ]:d } "
334
327
if pieces ["dirty" ]:
335
328
rendered += ".dev0"
336
329
rendered += plus_or_dot (pieces )
337
- rendered += "g{}" . format ( pieces [" short" ])
330
+ rendered += f "g{ pieces [' short' ] } "
338
331
else :
339
332
# exception #1
340
333
rendered = "0.post%d" % pieces ["distance" ]
341
334
if pieces ["dirty" ]:
342
335
rendered += ".dev0"
343
- rendered += "+g{}" . format ( pieces [" short" ])
336
+ rendered += f "+g{ pieces [' short' ] } "
344
337
return rendered
345
338
346
339
@@ -374,7 +367,7 @@ def render_git_describe(pieces):
374
367
if pieces ["closest-tag" ]:
375
368
rendered = pieces ["closest-tag" ]
376
369
if pieces ["distance" ]:
377
- rendered += "-{:d}-g{}" . format ( pieces ["distance" ], pieces [ " short" ])
370
+ rendered += f "-{ pieces [ 'distance' ] :d} -g{ pieces [' short' ] } "
378
371
else :
379
372
# exception #1
380
373
rendered = pieces ["short" ]
@@ -392,7 +385,7 @@ def render_git_describe_long(pieces):
392
385
393
386
if pieces ["closest-tag" ]:
394
387
rendered = pieces ["closest-tag" ]
395
- rendered += "-{:d}-g{}" . format ( pieces ["distance" ], pieces [ " short" ])
388
+ rendered += f "-{ pieces [ 'distance' ] :d} -g{ pieces [' short' ] } "
396
389
else :
397
390
# exception #1
398
391
rendered = pieces ["short" ]
@@ -426,7 +419,7 @@ def render(pieces, style):
426
419
elif style == "git-describe-long" :
427
420
rendered = render_git_describe_long (pieces )
428
421
else :
429
- raise ValueError ("unknown style '{style}'" . format ( style = style ) )
422
+ raise ValueError (f "unknown style '{ style } '" )
430
423
431
424
return {
432
425
"version" : rendered ,
0 commit comments