@@ -25,7 +25,7 @@ def get_template_environment() -> Environment:
2525class template :
2626 """Template decorator and registry."""
2727
28- _registry : dict = dict ()
28+ _registry : typing . ClassVar [ dict ] = {}
2929
3030 def __init__ (self , name : str ) -> None :
3131 self .name = name
@@ -160,15 +160,15 @@ def template_name(self) -> str:
160160
161161 @property
162162 def template_variables (self ) -> dict [str , typing .Any ]:
163- return dict (
164- description = self .description ,
165- env = self .env ,
166- testpaths = self .package_paths (ns_name ("test-path" )),
167- testargs = self .config .settings .get ("mxmake-test-runner-args" , "" ),
168- )
163+ return {
164+ " description" : self .description ,
165+ " env" : self .env ,
166+ " testpaths" : self .package_paths (ns_name ("test-path" )),
167+ " testargs" : self .config .settings .get ("mxmake-test-runner-args" , "" ),
168+ }
169169
170170 def package_paths (self , attr : str ) -> list [str ]:
171- paths = list ()
171+ paths = []
172172 for name , package in self .config .packages .items ():
173173 if attr not in package :
174174 continue
@@ -220,13 +220,13 @@ def target_folder(self) -> Path:
220220
221221 @property
222222 def template_variables (self ) -> dict [str , typing .Any ]:
223- return dict (
224- find_links = [
223+ return {
224+ " find_links" : [
225225 link .strip ()
226226 for link in self .settings .get ("find-links" , "" ).split ("\n " )
227227 if link .strip ()
228228 ]
229- )
229+ }
230230
231231
232232##############################################################################
@@ -260,17 +260,17 @@ def template_variables(self) -> dict[str, typing.Any]:
260260 for domain in self .domains :
261261 if not domain .settings :
262262 continue
263- domain_setting = dict ( fqn = domain .fqn , settings = [])
263+ domain_setting = { " fqn" : domain .fqn , " settings" : []}
264264 settings .append (domain_setting )
265265 for setting in domain .settings :
266266 sfqn = f"{ domain .fqn } .{ setting .name } "
267267 domain_setting ["settings" ].append (
268- dict (
269- name = setting .name ,
270- description = setting .description .split ("\n " ),
271- default = setting .default ,
272- value = self .domain_settings .get (sfqn , setting .default ),
273- )
268+ {
269+ " name" : setting .name ,
270+ " description" : setting .description .split ("\n " ),
271+ " default" : setting .default ,
272+ " value" : self .domain_settings .get (sfqn , setting .default ),
273+ }
274274 )
275275 # render domain sections
276276 sections = io .StringIO ()
@@ -284,12 +284,12 @@ def template_variables(self) -> dict[str, typing.Any]:
284284 topics = {domain .topic for domain in self .domains }
285285 additional_targets ["qa" ] = "qa" in topics
286286 # return template variables
287- return dict (
288- settings = settings ,
289- sections = sections ,
290- fqns = fqns ,
291- additional_targets = additional_targets ,
292- )
287+ return {
288+ " settings" : settings ,
289+ " sections" : sections ,
290+ " fqns" : fqns ,
291+ " additional_targets" : additional_targets ,
292+ }
293293
294294
295295##############################################################################
@@ -317,7 +317,7 @@ def target_folder(self) -> Path:
317317
318318 @property
319319 def template_variables (self ) -> dict [str , typing .Any ]:
320- return dict ( additional_sources_targets = self .additional_sources_targets )
320+ return { " additional_sources_targets" : self .additional_sources_targets }
321321
322322
323323##############################################################################
@@ -351,24 +351,24 @@ def template_variables(self) -> dict[str, typing.Any]:
351351 for domain in self .domains :
352352 if domain .fqn == "qa.test" :
353353 mxmake_env = True
354- template = dict ( name = " run-tests" , settings = dict ( environment = " env"))
354+ template = { " name" : " run-tests" , " settings" : { " environment" : " env"}}
355355 mxmake_templates .append (template )
356356 if domain .fqn == "qa.coverage" :
357357 mxmake_env = True
358- template = dict ( name = " run-coverage" , settings = dict ( environment = " env"))
358+ template = { " name" : " run-coverage" , " settings" : { " environment" : " env"}}
359359 mxmake_templates .append (template )
360360 if domain .fqn == "applications.plone" :
361- template = dict (
362- name = "plone-site" ,
363- settings = dict (
364- distribution = " volto" , extension_ids = "plone.volto:default"
365- ) ,
366- )
361+ template = {
362+ " name" : "plone-site" ,
363+ " settings" : {
364+ " distribution" : " volto" , " extension_ids" : "plone.volto:default"
365+ } ,
366+ }
367367 mxmake_templates .append (template )
368- return dict (
369- mxmake_templates = mxmake_templates ,
370- mxmake_env = mxmake_env ,
371- )
368+ return {
369+ " mxmake_templates" : mxmake_templates ,
370+ " mxmake_env" : mxmake_env ,
371+ }
372372
373373
374374##############################################################################
@@ -439,7 +439,7 @@ def write(self) -> None:
439439
440440
441441class ci_template :
442- templates : list = list ()
442+ templates : typing . ClassVar [ list ] = []
443443
444444 def __init__ (self , name : str ) -> None :
445445 self .name = name
@@ -461,9 +461,9 @@ def __init__(
461461
462462 @property
463463 def template_variables (self ) -> dict [str , typing .Any ]:
464- return dict (
465- project_path_python = self .settings .get ("PROJECT_PATH_PYTHON" , "" ),
466- )
464+ return {
465+ " project_path_python" : self .settings .get ("PROJECT_PATH_PYTHON" , "" ),
466+ }
467467
468468 @property
469469 def target_folder (self ) -> Path :
@@ -547,7 +547,7 @@ def template_variables(self):
547547 vars ["distribution" ] = site .pop ("distribution" )
548548
549549 # handle extension ids
550- if site .get ("extension_ids" , None ) is not None :
550+ if site .get ("extension_ids" ) is not None :
551551 site ["extension_ids" ] = [
552552 eid .strip () for eid in site ["extension_ids" ].split ("\n " ) if eid .strip ()
553553 ]
@@ -588,5 +588,5 @@ def template_variables(self):
588588 domains .append (topic .domain (domain_name .strip ()))
589589 for domain in domains :
590590 for target in domain .targets :
591- targets .append (dict ( name = target .name , folder = folder ) )
592- return dict ( targets = targets )
591+ targets .append ({ " name" : target .name , " folder" : folder } )
592+ return { " targets" : targets }
0 commit comments