Basic cleanups

iso/empanadas/empanadas/backends/imagefactory.py

@@ -275,7 +275,6 @@ def setup_staging(self):
                     "VMware": {"format": "vmdk", "provider": "vmware_desktop"}
                     }
             output = f"{_map[self.ctx.variant]['format']}"  # type: ignore
-            provider = f"{_map[self.ctx.variant]['provider']}"  # type: ignore
 
             # pop from the options map that will be passed to the vagrant metadata.json
             convert_options = _map[self.ctx.variant].pop('convertOptions') if 'convertOptions' in _map[self.ctx.variant].keys() else ''  # type: ignore

iso/empanadas/empanadas/builders/imagebuild.py

@@ -2,7 +2,6 @@
 
 import datetime
 import logging
-import os
 import pathlib
 
 from attrs import define, field

iso/empanadas/empanadas/common.py

@@ -2,7 +2,6 @@
 import glob
 import platform
 import time
-from collections import defaultdict
 from attrs import define, field
 
 
@@ -96,21 +95,8 @@ class Color:
     with open(conf, "r", encoding="utf-8") as file:
         sigdict.update(yaml.safe_load(file))
 
-# The system needs to be a RHEL-like system. It cannot be Fedora or SuSE.
-# if "%rhel" in config['rlmacro']:
-#    raise SystemExit(Color.BOLD + 'This is not a RHEL-like system.' + Color.END
-#            + '\n\nPlease verify you are running on a RHEL-like system that is '
-#            'not Fedora nor SuSE. This means that the %rhel macro will be '
-#            'defined with a value equal to the version you are targetting. RHEL'
-#            ' and its derivatives have this set.')
 
 
-# These will be set in their respective var files
-# REVISION = rlvars['revision'] + '-' + rlvars['rclvl']
-# rlvars = rldict[rlver]
-# rlvars = rldict[rlmacro]
-# COMPOSE_ISO_WORKDIR = COMPOSE_ROOT + "work/" + arch + "/" + date_stamp
-
 
 ALLOWED_TYPE_VARIANTS = {
     "Azure": ["Base", "LVM"],

iso/empanadas/empanadas/scripts/build_iso_extra.py

@@ -3,7 +3,6 @@
 import argparse
 
 from empanadas.common import *
-from empanadas.util import Checks
 from empanadas.util import IsoBuild
 
 parser = argparse.ArgumentParser(description="ISO Compose")

iso/empanadas/empanadas/scripts/build_iso_live.py

@@ -3,7 +3,6 @@
 import argparse
 
 from empanadas.common import *
-from empanadas.util import Checks
 from empanadas.util import LiveBuild
 
 parser = argparse.ArgumentParser(description="Live ISO Compose")

iso/empanadas/empanadas/scripts/build_iso_live_test.py

@@ -3,8 +3,6 @@
 import argparse
 
 from empanadas.common import *
-from empanadas.util import Checks
-from empanadas.util import IsoBuild
 
 parser = argparse.ArgumentParser(description="Live ISO Compose")
 

iso/empanadas/empanadas/scripts/generate_compose.py

@@ -7,7 +7,6 @@
 
 from empanadas.common import *
 from empanadas.util import Checks
-from empanadas.util import RepoSync
 from empanadas.util import Shared
 
 # Start up the parser baby

iso/empanadas/empanadas/scripts/pull_cloud_image.py

@@ -3,7 +3,6 @@
 import argparse
 
 from empanadas.common import *
-from empanadas.util import Checks
 from empanadas.util import IsoBuild
 
 parser = argparse.ArgumentParser(description="ISO Artifact Builder")

iso/empanadas/empanadas/scripts/pull_iso_image.py

@@ -3,7 +3,6 @@
 import argparse
 
 from empanadas.common import *
-from empanadas.util import Checks
 from empanadas.util import IsoBuild
 
 parser = argparse.ArgumentParser(description="ISO Artifact Builder")

iso/empanadas/empanadas/scripts/pull_unpack_tree.py

@@ -3,7 +3,6 @@
 import argparse
 
 from empanadas.common import *
-from empanadas.util import Checks
 from empanadas.util import IsoBuild
 
 parser = argparse.ArgumentParser(description="ISO Artifact Builder")

iso/empanadas/empanadas/scripts/sync_from_peridot_test.py

@@ -1,7 +1,5 @@
 # This is a testing script to ensure the RepoSync class is working as intended.
 
-import argparse
-
 import empanadas
 from empanadas.common import *
 from empanadas.util import Checks

iso/empanadas/empanadas/scripts/sync_sig.py

@@ -5,10 +5,6 @@
 from empanadas.util import Checks
 from empanadas.util import SigRepoSync
 
-#rlvars = rldict['9']
-#r = Checks(rlvars, config['arch'])
-#r.check_validity()
-
 # Start up the parser baby
 parser = argparse.ArgumentParser(description="Peridot Sync and Compose")
 

iso/empanadas/empanadas/scripts/test_module.py

@@ -2,11 +2,9 @@
 
 import argparse
 import sys
-#import createrepo_c as cr
 
 from empanadas.common import *
 from empanadas.util import Checks
-from empanadas.util import RepoSync
 
 # Start up the parser baby
 parser = argparse.ArgumentParser(description="Peridot Upstream Repoclosure")

iso/empanadas/empanadas/templates/isomock.tmpl.cfg

@@ -35,7 +35,7 @@ best=1
 install_weak_deps=0
 protected_packages=
 module_platform_id=platform:{{ dist }}
-user_agent={{ user_agent }}
+user_agent={{ '{{' }} user_agent {{ '}}' }}
 
 {% for repo in repos %}
 [{{ repo.name }}]