@@ -276,7 +276,7 @@ def build_cache_mirror(self) -> Optional[str]:
276276 def push_to_build_cache (self ) -> Optional [str ]:
277277 """The build cache mirror name to push built packages to, or None.
278278
279- Pushing requires a private signing key or an access pair for an S3 bucket;
279+ Pushing requires a private signing key or an access pair for an S3 bucket;
280280 a build cache configured without one is read-only - fetched from but never pushed to.
281281 """
282282
@@ -408,39 +408,35 @@ def config_files(self, config_root: pathlib.Path) -> Dict[pathlib.Path, bytes]:
408408 "fetch" : {
409409 "url" : url ,
410410 "access_pair" : self .buildcache ["access_pair" ],
411- "endpoint_url" : self .buildcache ["endpoint_url" ]
411+ "endpoint_url" : self .buildcache ["endpoint_url" ],
412412 },
413413 "push" : {
414414 "url" : url ,
415415 "access_pair" : self .buildcache ["access_pair" ],
416- "endpoint_url" : self .buildcache ["endpoint_url" ]
416+ "endpoint_url" : self .buildcache ["endpoint_url" ],
417417 },
418418 }
419419 else :
420420 spack_mirrors ["mirrors" ][self .buildcache ["name" ]] = {
421- "fetch" : {"url" : mirror ["url" ]},
422- "push" : {"url" : mirror ["url" ]},
423- }
424-
421+ "fetch" : {"url" : self .buildcache ["url" ]},
422+ "push" : {"url" : self .buildcache ["url" ]},
423+ }
425424
426425 # source mirrors are read-only and provide sources only. Push url is required but never used
427426 for name , mirror in self .source_mirrors .items ():
428- if (
429- mirror .get ("access_pair" ) is not None
430- and mirror .get ("endpoint_url" ) is not None
431- ):
427+ if mirror .get ("access_pair" ) is not None and mirror .get ("endpoint_url" ) is not None :
432428 spack_mirrors ["mirrors" ][name ] = {
433429 "source" : True ,
434430 "binary" : False ,
435431 "fetch" : {
436432 "url" : mirror ["url" ],
437433 "access_pair" : mirror ["access_pair" ],
438- "endpoint_url" : mirror ["endpoint_url" ]
434+ "endpoint_url" : mirror ["endpoint_url" ],
439435 },
440436 "push" : {
441437 "url" : mirror ["url" ],
442438 "access_pair" : mirror ["access_pair" ],
443- "endpoint_url" : mirror ["endpoint_url" ]
439+ "endpoint_url" : mirror ["endpoint_url" ],
444440 },
445441 }
446442 else :
0 commit comments