@@ -379,7 +379,7 @@ async def assert_volume(compose, mount_dict):
379379 proj_name = compose .project_name
380380 vol_name = vol ["name" ]
381381 is_ext = vol .get ("external" , None )
382- log .debug (f "podman volume inspect { vol_name } || podman volume create { vol_name } " )
382+ log .debug ("podman volume inspect %s || podman volume create %s" , vol_name , vol_name )
383383 # TODO: might move to using "volume list"
384384 # podman volume list --format '{{.Name}}\t{{.MountPoint}}' \
385385 # -f 'label=io.podman.compose.project=HERE'
@@ -555,9 +555,11 @@ def get_secret_args(compose, cnt, secret):
555555 volume_ref = ["--volume" , f"{ source_file } :{ dest_file } :ro,rprivate,rbind" ]
556556 if uid or gid or mode :
557557 sec = target if target else secret_name
558- log .warn (
559- f'WARNING: Service { cnt ["_service" ]} uses secret "{ sec } " with uid, gid, or mode.'
560- + " These fields are not supported by this implementation of the Compose file"
558+ log .warning (
559+ "WARNING: Service %s uses secret %s with uid, gid, or mode."
560+ + " These fields are not supported by this implementation of the Compose file" ,
561+ cnt ["_service" ],
562+ sec ,
561563 )
562564 return volume_ref
563565 # v3.5 and up added external flag, earlier the spec
@@ -586,11 +588,12 @@ def get_secret_args(compose, cnt, secret):
586588 if target and target != secret_name :
587589 raise ValueError (err_str .format (target , secret_name ))
588590 if target :
589- log .warn (
590- 'WARNING: Service "{}" uses target: "{}" for secret: "{}".' .format (
591- cnt ["_service" ], target , secret_name
592- )
593- + " That is un-supported and a no-op and is ignored."
591+ log .warning (
592+ 'WARNING: Service "%s" uses target: "%s" for secret: "%s".'
593+ + " That is un-supported and a no-op and is ignored." ,
594+ cnt ["_service" ],
595+ target ,
596+ secret_name ,
594597 )
595598 return ["--secret" , "{}{}" .format (secret_name , secret_opts )]
596599
@@ -770,7 +773,7 @@ def get_net_args(compose, cnt):
770773 elif net .startswith ("bridge" ):
771774 is_bridge = True
772775 else :
773- log .fatal (f "unknown network_mode [{ net } ]" )
776+ log .fatal ("unknown network_mode [%s]" , net )
774777 sys .exit (1 )
775778 else :
776779 is_bridge = True
@@ -913,10 +916,10 @@ async def container_to_args(compose, cnt, detached=True):
913916 await assert_cnt_nets (compose , cnt )
914917 podman_args .extend (get_net_args (compose , cnt ))
915918
916- logging = cnt .get ("logging" , None )
917- if logging is not None :
918- podman_args .append (f'--log-driver={ logging .get ("driver" , "k8s-file" )} ' )
919- log_opts = logging .get ("options" ) or {}
919+ log_config = cnt .get ("logging" , None )
920+ if log_config is not None :
921+ podman_args .append (f'--log-driver={ log_config .get ("driver" , "k8s-file" )} ' )
922+ log_opts = log_config .get ("options" ) or {}
920923 podman_args += [f"--log-opt={ name } ={ value } " for name , value in log_opts .items ()]
921924 for secret in cnt .get ("secrets" , []):
922925 podman_args .extend (get_secret_args (compose , cnt , secret ))
@@ -1226,7 +1229,7 @@ async def format_out(stdout):
12261229 p .kill ()
12271230 exit_code = await p .wait ()
12281231
1229- log .info (f "exit code: { exit_code } " )
1232+ log .info ("exit code: %s" , exit_code )
12301233 return exit_code
12311234
12321235 async def volume_ls (self , proj = None ):
@@ -1474,7 +1477,7 @@ def assert_services(self, services):
14741477 missing = given - self .all_services
14751478 if missing :
14761479 missing_csv = "," .join (missing )
1477- log .warn ( f "missing services [{ missing_csv } ]" )
1480+ log .warning ( "missing services [%s]" , missing_csv )
14781481 sys .exit (1 )
14791482
14801483 def get_podman_args (self , cmd ):
@@ -1488,7 +1491,7 @@ def get_podman_args(self, cmd):
14881491 return xargs
14891492
14901493 async def run (self ):
1491- log .info ("podman-compose version: " + __version__ )
1494+ log .info ("podman-compose version: %s" , __version__ )
14921495 args = self ._parse_args ()
14931496 podman_path = args .podman_path
14941497 if podman_path != "podman" :
@@ -1497,7 +1500,7 @@ async def run(self):
14971500 else :
14981501 # this also works if podman hasn't been installed now
14991502 if args .dry_run is False :
1500- log .fatal (f "Binary { podman_path } has not been found." )
1503+ log .fatal ("Binary %s has not been found." , podman_path )
15011504 sys .exit (1 )
15021505 self .podman = Podman (self , podman_path , args .dry_run , asyncio .Semaphore (args .parallel ))
15031506
@@ -1513,7 +1516,7 @@ async def run(self):
15131516 if not self .podman_version :
15141517 log .fatal ("it seems that you do not have `podman` installed" )
15151518 sys .exit (1 )
1516- log .info ("using podman version: " + self .podman_version )
1519+ log .info ("using podman version: %s" , self .podman_version )
15171520 cmd_name = args .command
15181521 compose_required = cmd_name != "version" and (
15191522 cmd_name != "systemd" or args .action != "create-unit"
@@ -1648,7 +1651,7 @@ def _parse_compose_file(self):
16481651 services = compose .get ("services" , None )
16491652 if services is None :
16501653 services = {}
1651- log .warn ("WARNING: No services defined" )
1654+ log .warning ("WARNING: No services defined" )
16521655 # include services with no profile defined or the selected profiles
16531656 services = self ._resolve_profiles (services , set (args .profile ))
16541657
@@ -1681,7 +1684,7 @@ def _parse_compose_file(self):
16811684 unused_nets = given_nets - allnets - set (["default" ])
16821685 if len (unused_nets ):
16831686 unused_nets_str = "," .join (unused_nets )
1684- log .warn ( f "WARNING: unused networks: { unused_nets_str } " )
1687+ log .warning ( "WARNING: unused networks: %s" , unused_nets_str )
16851688 if len (missing_nets ):
16861689 missing_nets_str = "," .join (missing_nets )
16871690 raise RuntimeError (f"missing networks: { missing_nets_str } " )
@@ -1793,7 +1796,7 @@ def _parse_args(self):
17931796 parser .print_help ()
17941797 sys .exit (- 1 )
17951798
1796- logging .basicConfig (level = (' DEBUG' if self .global_args .verbose else ' WARN' ))
1799+ logging .basicConfig (level = (" DEBUG" if self .global_args .verbose else " WARN" ))
17971800 return self .global_args
17981801
17991802 @staticmethod
@@ -1981,12 +1984,12 @@ async def compose_systemd(compose, args):
19811984 proj_name = compose .project_name
19821985 fn = os .path .expanduser (f"~/{ stacks_dir } /{ proj_name } .env" )
19831986 os .makedirs (os .path .dirname (fn ), exist_ok = True )
1984- log .debug (f "writing [{ fn } ]: ..." )
1987+ log .debug ("writing [%s ]: ..." , fn )
19851988 with open (fn , "w" , encoding = "utf-8" ) as f :
19861989 for k , v in compose .environ .items ():
19871990 if k .startswith ("COMPOSE_" ) or k .startswith ("PODMAN_" ):
19881991 f .write (f"{ k } ={ v } \n " )
1989- log .debug (f "writing [{ fn } ]: done." )
1992+ log .debug ("writing [%s ]: done." , fn )
19901993 log .info ("\n \n creating the pod without starting it: ...\n \n " )
19911994 process = await asyncio .subprocess .create_subprocess_exec (script , ["up" , "--no-start" ])
19921995 log .info ("\n final exit code is " , process )
@@ -2036,18 +2039,18 @@ async def compose_systemd(compose, args):
20362039WantedBy=default.target
20372040"""
20382041 if os .access (os .path .dirname (fn ), os .W_OK ):
2039- log .debug (f "writing [{ fn } ]: ..." )
2042+ log .debug ("writing [%s ]: ..." , fn )
20402043 with open (fn , "w" , encoding = "utf-8" ) as f :
20412044 f .write (out )
2042- log .debug (f "writing [{ fn } ]: done." )
2045+ log .debug ("writing [%s ]: done." , fn )
20432046 print (
20442047 """
20452048while in your project type `podman-compose systemd -a register`
20462049"""
20472050 )
20482051 else :
20492052 print (out )
2050- log .warn ( f "Could not write to [{ fn } ], use 'sudo'" )
2053+ log .warning ( "Could not write to [%s ], use 'sudo'" , fn )
20512054
20522055
20532056@cmd_run (podman_compose , "pull" , "pull stack images" )
@@ -2367,7 +2370,7 @@ async def compose_down(compose, args):
23672370 if cnt ["_service" ] not in excluded :
23682371 continue
23692372 vol_names_to_keep .update (get_volume_names (compose , cnt ))
2370- log .debug ("keep" , vol_names_to_keep )
2373+ log .debug ("keep %s " , vol_names_to_keep )
23712374 for volume_name in await compose .podman .volume_ls ():
23722375 if volume_name in vol_names_to_keep :
23732376 continue
0 commit comments