@@ -88,7 +88,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env=
88
88
if e .errno == errno .ENOENT :
89
89
continue
90
90
if verbose :
91
- print ("unable to run %s" % dispcmd )
91
+ print (f "unable to run { dispcmd } " )
92
92
print (e )
93
93
return None , None
94
94
else :
@@ -98,8 +98,8 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env=
98
98
stdout = p .communicate ()[0 ].strip ().decode ()
99
99
if p .returncode != 0 :
100
100
if verbose :
101
- print ("unable to run %s (error)" % dispcmd )
102
- print ("stdout was %s" % stdout )
101
+ print (f "unable to run { dispcmd } (error)" )
102
+ print (f "stdout was { stdout } " )
103
103
return None , p .returncode
104
104
return stdout , p .returncode
105
105
@@ -202,15 +202,15 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
202
202
# "stabilization", as well as "HEAD" and "main".
203
203
tags = {r for r in refs if re .search (r"\d" , r )}
204
204
if verbose :
205
- print ("discarding '%s', no digits" % "," .join (refs - tags ))
205
+ print (f "discarding '{ ',' .join (refs - tags )} ', no digits" )
206
206
if verbose :
207
- print ("likely tags: %s" % "," .join (sorted (tags )))
207
+ print (f "likely tags: { ',' .join (sorted (tags ))} " )
208
208
for ref in sorted (tags ):
209
209
# sorting will prefer e.g. "2.0" over "2.0rc1"
210
210
if ref .startswith (tag_prefix ):
211
211
r = ref [len (tag_prefix ) :]
212
212
if verbose :
213
- print ("picking %s" % r )
213
+ print (f "picking { r } " )
214
214
return {
215
215
"version" : r ,
216
216
"full-revisionid" : keywords ["full" ].strip (),
@@ -245,7 +245,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
245
245
out , rc = run_command (GITS , ["rev-parse" , "--git-dir" ], cwd = root , hide_stderr = True )
246
246
if rc != 0 :
247
247
if verbose :
248
- print ("Directory %s not under git control" % root )
248
+ print (f "Directory { root } not under git control" )
249
249
raise NotThisMethod ("'git rev-parse --git-dir' returned error" )
250
250
251
251
# if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty]
@@ -259,7 +259,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
259
259
"--always" ,
260
260
"--long" ,
261
261
"--match" ,
262
- "%s*" % tag_prefix ,
262
+ f" { tag_prefix } *" ,
263
263
],
264
264
cwd = root ,
265
265
)
@@ -294,7 +294,7 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
294
294
mo = re .search (r"^(.+)-(\d+)-g([0-9a-f]+)$" , git_describe )
295
295
if not mo :
296
296
# unparsable. Maybe git-describe is misbehaving?
297
- pieces ["error" ] = "unable to parse git-describe output: '%s'" % describe_out
297
+ pieces ["error" ] = f "unable to parse git-describe output: '{ describe_out } '"
298
298
return pieces
299
299
300
300
# tag
@@ -354,12 +354,12 @@ def render_pep440(pieces):
354
354
rendered = pieces ["closest-tag" ]
355
355
if pieces ["distance" ] or pieces ["dirty" ]:
356
356
rendered += plus_or_dot (pieces )
357
- rendered += "%d.g%s" % (pieces [" distance" ], pieces [" short" ])
357
+ rendered += f" { int (pieces [' distance' ]) } .g { pieces [' short' ] } "
358
358
if pieces ["dirty" ]:
359
359
rendered += ".dirty"
360
360
else :
361
361
# exception #1
362
- rendered = "0+untagged.%d.g%s" % (pieces [" distance" ], pieces [" short" ])
362
+ rendered = f "0+untagged.{ int (pieces [' distance' ]) } .g { pieces [' short' ] } "
363
363
if pieces ["dirty" ]:
364
364
rendered += ".dirty"
365
365
return rendered
@@ -374,10 +374,10 @@ def render_pep440_pre(pieces):
374
374
if pieces ["closest-tag" ]:
375
375
rendered = pieces ["closest-tag" ]
376
376
if pieces ["distance" ]:
377
- rendered += ".post0.dev%d" % pieces [" distance" ]
377
+ rendered += f ".post0.dev{ int ( pieces [' distance' ]) } "
378
378
else :
379
379
# exception #1
380
- rendered = "0.post0.dev%d" % pieces [" distance" ]
380
+ rendered = f "0.post0.dev{ int ( pieces [' distance' ]) } "
381
381
return rendered
382
382
383
383
@@ -394,17 +394,17 @@ def render_pep440_post(pieces):
394
394
if pieces ["closest-tag" ]:
395
395
rendered = pieces ["closest-tag" ]
396
396
if pieces ["distance" ] or pieces ["dirty" ]:
397
- rendered += ".post%d" % pieces [" distance" ]
397
+ rendered += f ".post{ int ( pieces [' distance' ]) } "
398
398
if pieces ["dirty" ]:
399
399
rendered += ".dev0"
400
400
rendered += plus_or_dot (pieces )
401
- rendered += "g%s" % pieces [" short" ]
401
+ rendered += f"g { pieces [' short' ] } "
402
402
else :
403
403
# exception #1
404
- rendered = "0.post%d" % pieces [" distance" ]
404
+ rendered = f "0.post{ int ( pieces [' distance' ]) } "
405
405
if pieces ["dirty" ]:
406
406
rendered += ".dev0"
407
- rendered += "+g%s" % pieces [" short" ]
407
+ rendered += f "+g{ pieces [' short' ] } "
408
408
return rendered
409
409
410
410
@@ -419,12 +419,12 @@ def render_pep440_old(pieces):
419
419
if pieces ["closest-tag" ]:
420
420
rendered = pieces ["closest-tag" ]
421
421
if pieces ["distance" ] or pieces ["dirty" ]:
422
- rendered += ".post%d" % pieces [" distance" ]
422
+ rendered += f ".post{ int ( pieces [' distance' ]) } "
423
423
if pieces ["dirty" ]:
424
424
rendered += ".dev0"
425
425
else :
426
426
# exception #1
427
- rendered = "0.post%d" % pieces [" distance" ]
427
+ rendered = f "0.post{ int ( pieces [' distance' ]) } "
428
428
if pieces ["dirty" ]:
429
429
rendered += ".dev0"
430
430
return rendered
@@ -441,7 +441,7 @@ def render_git_describe(pieces):
441
441
if pieces ["closest-tag" ]:
442
442
rendered = pieces ["closest-tag" ]
443
443
if pieces ["distance" ]:
444
- rendered += "-%d-g%s" % (pieces [" distance" ], pieces [" short" ])
444
+ rendered += f"- { int (pieces [' distance' ]) } -g { pieces [' short' ] } "
445
445
else :
446
446
# exception #1
447
447
rendered = pieces ["short" ]
@@ -461,7 +461,7 @@ def render_git_describe_long(pieces):
461
461
"""
462
462
if pieces ["closest-tag" ]:
463
463
rendered = pieces ["closest-tag" ]
464
- rendered += "-%d-g%s" % (pieces [" distance" ], pieces [" short" ])
464
+ rendered += f"- { int (pieces [' distance' ]) } -g { pieces [' short' ] } "
465
465
else :
466
466
# exception #1
467
467
rendered = pieces ["short" ]
@@ -497,7 +497,7 @@ def render(pieces, style):
497
497
elif style == "git-describe-long" :
498
498
rendered = render_git_describe_long (pieces )
499
499
else :
500
- raise ValueError ("unknown style '%s'" % style )
500
+ raise ValueError (f "unknown style '{ style } '" )
501
501
502
502
return {
503
503
"version" : rendered ,
0 commit comments