linting

Author: grodzki-lanl

stackinator/mirror.py

@@ -1,11 +1,8 @@
-from typing import Optional, Dict
+from typing import Optional, List, Dict
 import base64
 import io
 import os
 import pathlib
-import shutil
-import urllib.error
-import urllib.request
 import requests
 import yaml
 
@@ -67,9 +64,7 @@ def _load_mirrors(self, cmdline_cache: Optional[pathlib.Path]) -> Dict[str, Dict
         buildcache = mirrors.get("buildcache")
         if buildcache and buildcache.get("enabled", True):
             if not buildcache.get("private_key"):
-                raise MirrorError(
-                    "Mirror build cache config is missing a required 'private_key' path."
-                )
+                raise MirrorError("Mirror build cache config is missing a required 'private_key' path.")
             self.build_cache_mirror = "buildcache"
             enabled_mirrors["buildcache"] = buildcache
         else:
@@ -123,7 +118,7 @@ def _load_cmdline_cache(self, cache_config_path: pathlib.Path) -> Dict:
             "enabled": True,
             "mount_specific": True,
             "private_key": raw["key"],
-            "cmdline": True
+            "cmdline": True,
         }
 
         self._logger.warning(
@@ -183,7 +178,7 @@ def _create_spack_mirrors_yaml(self, dest: pathlib.Path):
             url = mirror["url"]
 
             # Make the mirror path specific to the mount point
-            if(name=="buildcache"):
+            if name == "buildcache":
                 if mirror["mount_specific"] and self._mount_point is not None:
                     url = url.rstrip("/") + "/" + self._mount_point.as_posix().lstrip("/")
 
@@ -226,8 +221,8 @@ def _create_bootstrap_configs(self, config_root: pathlib.Path):
             "type": "install",
             "info": {
                 "url": mirror["url"],
-            }
-        }            
+            },
+        }
         with (bs_mirror_path / "metadata.yaml").open("w") as file:
             yaml.dump(bs_mirror_yaml, file, default_flow_style=False)
 
@@ -274,8 +269,7 @@ def _load_key(self, key: str, dest: pathlib.Path, name: str):
             writer.write(binary_key)
 
         self._keys.append(dest)
-    
-    
+
     def _key_setup(self, key_store: pathlib.Path):
         """Iterate through mirror keys and load + relocate each one to key_store"""
 

stackinator/recipe.py

@@ -172,8 +172,7 @@ def __init__(self, args):
         # load the optional mirrors.yaml from system config, and add any additional
         # mirrors specified on the command line.
         self._logger.debug("Configuring mirrors.")
-        self.mirrors = mirror.Mirrors(self.system_config_path, 
-                                      pathlib.Path(args.cache) if args.cache else None)
+        self.mirrors = mirror.Mirrors(self.system_config_path, pathlib.Path(args.cache) if args.cache else None)
 
         # optional post install hook
         if self.post_install_hook is not None:

unittests/test_mirrors.py

@@ -32,15 +32,11 @@ def test_mirror_init(systems_path):
             "mount_specific": False,
             "cmdline": False,
         },
-        "mirror1": {
-            "url": "https://github.com",
-            "enabled": True,
-            "public_key": "../../test-gpg-pub.asc"
-        },
+        "mirror1": {"url": "https://github.com", "enabled": True, "public_key": "../../test-gpg-pub.asc"},
         "mirror2": {
             "url": "https://github.com/spack",
             "enabled": True,
-        }
+        },
     }
 
     with (systems_path / "../test-gpg-pub.asc").open("rb") as pub_key_file:
@@ -142,7 +138,7 @@ def test_create_bootstrap_configs(tmp_path, systems_path):
         "type": "install",
         "info": {
             "url": "https://mirror.spack.io",
-        }
+        },
     }
 
     mirrors_obj = mirror.Mirrors(systems_path / "mirror-ok")