From 4e1864aa2b5f21738da1df57d9681ebb11448fe2 Mon Sep 17 00:00:00 2001 From: Carlos Meza Date: Sun, 25 Feb 2018 05:46:15 +0000 Subject: [PATCH] fix pylint W0403(relative-import) paths --- bootstrapvz/plugins/minimize_size/__init__.py | 56 ++++---- bootstrapvz/providers/azure/__init__.py | 11 +- bootstrapvz/providers/docker/__init__.py | 20 ++- bootstrapvz/providers/ec2/__init__.py | 124 +++++++++--------- bootstrapvz/providers/gce/__init__.py | 36 +++-- bootstrapvz/providers/kvm/__init__.py | 11 +- bootstrapvz/providers/oracle/__init__.py | 24 ++-- bootstrapvz/providers/virtualbox/__init__.py | 7 +- pylintrc | 2 +- 9 files changed, 137 insertions(+), 154 deletions(-) diff --git a/bootstrapvz/plugins/minimize_size/__init__.py b/bootstrapvz/plugins/minimize_size/__init__.py index 2d8f0a0..f002304 100644 --- a/bootstrapvz/plugins/minimize_size/__init__.py +++ b/bootstrapvz/plugins/minimize_size/__init__.py @@ -1,8 +1,6 @@ -from . import tasks.mounts -from . import tasks.shrink -from . import tasks.apt -from . import tasks.dpkg from bootstrapvz.common.tasks import locale +from .tasks import mounts, shrink, apt, dpkg +import bootstrapvz.common.tasks.dpkg def get_shrink_type(plugins): @@ -33,47 +31,47 @@ def validate_manifest(data, validator, error): def resolve_tasks(taskset, manifest): - taskset.update([tasks.mounts.AddFolderMounts, - tasks.mounts.RemoveFolderMounts, + taskset.update([mounts.AddFolderMounts, + mounts.RemoveFolderMounts, ]) if manifest.plugins['minimize_size'].get('zerofree', False): - taskset.add(tasks.shrink.AddRequiredZeroFreeCommand) - taskset.add(tasks.shrink.Zerofree) + taskset.add(shrink.AddRequiredZeroFreeCommand) + taskset.add(shrink.Zerofree) if get_shrink_type(manifest.plugins) == 'vmware-vdiskmanager': - taskset.add(tasks.shrink.AddRequiredVDiskManagerCommand) - taskset.add(tasks.shrink.ShrinkVolumeWithVDiskManager) + taskset.add(shrink.AddRequiredVDiskManagerCommand) + taskset.add(shrink.ShrinkVolumeWithVDiskManager) if get_shrink_type(manifest.plugins) == 'qemu-img': - taskset.add(tasks.shrink.AddRequiredQemuImgCommand) - taskset.add(tasks.shrink.ShrinkVolumeWithQemuImg) + taskset.add(shrink.AddRequiredQemuImgCommand) + taskset.add(shrink.ShrinkVolumeWithQemuImg) if 'apt' in manifest.plugins['minimize_size']: - apt = manifest.plugins['minimize_size']['apt'] - if apt.get('autoclean', False): - taskset.add(tasks.apt.AutomateAptClean) - if 'languages' in apt: - taskset.add(tasks.apt.FilterTranslationFiles) - if apt.get('gzip_indexes', False): - taskset.add(tasks.apt.AptGzipIndexes) - if apt.get('autoremove_suggests', False): - taskset.add(tasks.apt.AptAutoremoveSuggests) + msapt = manifest.plugins['minimize_size']['apt'] + if msapt.get('autoclean', False): + taskset.add(apt.AutomateAptClean) + if 'languages' in msapt: + taskset.add(apt.FilterTranslationFiles) + if msapt.get('gzip_indexes', False): + taskset.add(apt.AptGzipIndexes) + if msapt.get('autoremove_suggests', False): + taskset.add(apt.AptAutoremoveSuggests) if 'dpkg' in manifest.plugins['minimize_size']: - filter_tasks = [dpkg.CreateDpkgCfg, - tasks.dpkg.InitializeBootstrapFilterList, - tasks.dpkg.CreateBootstrapFilterScripts, - tasks.dpkg.DeleteBootstrapFilterScripts, + filter_tasks = [bootstrapvz.common.tasks.dpkg.CreateDpkgCfg, + dpkg.InitializeBootstrapFilterList, + dpkg.CreateBootstrapFilterScripts, + dpkg.DeleteBootstrapFilterScripts, ] msdpkg = manifest.plugins['minimize_size']['dpkg'] if 'locales' in msdpkg: taskset.update(filter_tasks) - taskset.add(tasks.dpkg.FilterLocales) + taskset.add(dpkg.FilterLocales) # If no locales are selected, we don't need the locale package if msdpkg['locales']: taskset.discard(locale.LocaleBootstrapPackage) taskset.discard(locale.GenerateLocale) if msdpkg.get('exclude_docs', False): taskset.update(filter_tasks) - taskset.add(tasks.dpkg.ExcludeDocs) + taskset.add(dpkg.ExcludeDocs) def resolve_rollback_tasks(taskset, manifest, completed, counter_task): - counter_task(taskset, tasks.mounts.AddFolderMounts, tasks.mounts.RemoveFolderMounts) - counter_task(taskset, tasks.dpkg.CreateBootstrapFilterScripts, tasks.dpkg.DeleteBootstrapFilterScripts) + counter_task(taskset, mounts.AddFolderMounts, mounts.RemoveFolderMounts) + counter_task(taskset, dpkg.CreateBootstrapFilterScripts, dpkg.DeleteBootstrapFilterScripts) diff --git a/bootstrapvz/providers/azure/__init__.py b/bootstrapvz/providers/azure/__init__.py index f67d0c6..6e229d1 100644 --- a/bootstrapvz/providers/azure/__init__.py +++ b/bootstrapvz/providers/azure/__init__.py @@ -1,12 +1,11 @@ from bootstrapvz.common import task_groups -from . import tasks.packages -from . import tasks.boot from bootstrapvz.common.tasks import image from bootstrapvz.common.tasks import loopback from bootstrapvz.common.tasks import initd from bootstrapvz.common.tasks import ssh from bootstrapvz.common.tasks import apt from bootstrapvz.common.tasks import grub +from .tasks import packages, boot def validate_manifest(data, validator, error): @@ -17,7 +16,7 @@ def validate_manifest(data, validator, error): def resolve_tasks(taskset, manifest): taskset.update(task_groups.get_standard_groups(manifest)) taskset.update([apt.AddBackports, - tasks.packages.DefaultPackages, + packages.DefaultPackages, loopback.AddRequiredCommands, loopback.Create, image.MoveImage, @@ -25,9 +24,9 @@ def resolve_tasks(taskset, manifest): ssh.AddOpenSSHPackage, ssh.ShredHostkeys, ssh.AddSSHKeyGeneration, - tasks.packages.Waagent, - tasks.boot.ConfigureGrub, - tasks.boot.PatchUdev, + packages.Waagent, + boot.ConfigureGrub, + boot.PatchUdev, ]) taskset.discard(grub.SetGrubConsolOutputDeviceToSerial) diff --git a/bootstrapvz/providers/docker/__init__.py b/bootstrapvz/providers/docker/__init__.py index 7d6cc2f..7c64476 100644 --- a/bootstrapvz/providers/docker/__init__.py +++ b/bootstrapvz/providers/docker/__init__.py @@ -1,9 +1,7 @@ from bootstrapvz.common import task_groups from bootstrapvz.common.tasks import apt, dpkg, folder, filesystem from bootstrapvz.common.tools import rel_path -from . import tasks.commands -from . import tasks.image -from . import tasks.settings +from .tasks import commands, image, settings def validate_manifest(data, validator, error): @@ -28,17 +26,17 @@ def resolve_tasks(taskset, manifest): # Let the autostart of daemons by apt remain disabled taskset.discard(apt.EnableDaemonAutostart) - taskset.update([tasks.commands.AddRequiredCommands, - tasks.image.CreateDockerfileEntry, - tasks.image.CreateImage, - tasks.settings.DpkgUnsafeIo, - tasks.settings.AutoRemoveKernel, - tasks.settings.SystemdContainer + taskset.update([commands.AddRequiredCommands, + image.CreateDockerfileEntry, + image.CreateImage, + settings.DpkgUnsafeIo, + settings.AutoRemoveKernel, + settings.SystemdContainer ]) if 'labels' in manifest.provider: - taskset.add(tasks.image.PopulateLabels) + taskset.add(image.PopulateLabels) if 'dockerfile' in manifest.provider: - taskset.add(tasks.image.AppendManifestDockerfile) + taskset.add(image.AppendManifestDockerfile) def resolve_rollback_tasks(taskset, manifest, completed, counter_task): diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py index 7885006..9929987 100644 --- a/bootstrapvz/providers/ec2/__init__.py +++ b/bootstrapvz/providers/ec2/__init__.py @@ -1,16 +1,10 @@ from bootstrapvz.common import task_groups -from . import tasks.packages -from . import tasks.connection -from . import tasks.host -from . import tasks.ami -from . import tasks.ebs -from . import tasks.filesystem -from . import tasks.boot -from . import tasks.network -from . import tasks.initd -from . import tasks.tuning -from bootstrapvz.common.tasks import apt, boot, filesystem, grub, initd -from bootstrapvz.common.tasks import kernel, loopback, volume +from .tasks import packages, connection, host, ami, ebs, filesystem, boot, network, initd, tuning +import bootstrapvz.common.tasks.boot +import bootstrapvz.common.tasks.filesystem +import bootstrapvz.common.tasks.grub +import bootstrapvz.common.tasks.initd +from bootstrapvz.common.tasks import apt, kernel, loopback, volume from bootstrapvz.common.tools import rel_path @@ -57,94 +51,94 @@ def resolve_tasks(taskset, manifest): taskset.update(task_groups.get_standard_groups(manifest)) taskset.update(task_groups.ssh_group) - taskset.update([tasks.host.AddExternalCommands, - tasks.packages.DefaultPackages, - tasks.connection.SilenceBotoDebug, - tasks.connection.GetCredentials, - tasks.ami.AMIName, - tasks.connection.Connect, + taskset.update([host.AddExternalCommands, + packages.DefaultPackages, + connection.SilenceBotoDebug, + connection.GetCredentials, + ami.AMIName, + connection.Connect, - tasks.tuning.TuneSystem, - tasks.tuning.BlackListModules, - boot.BlackListModules, - boot.DisableGetTTYs, - tasks.boot.AddXenGrubConsoleOutputDevice, - grub.WriteGrubConfig, - tasks.boot.UpdateGrubConfig, - initd.AddExpandRoot, - initd.RemoveHWClock, - initd.InstallInitScripts, - tasks.ami.RegisterAMI, + tuning.TuneSystem, + tuning.BlackListModules, + bootstrapvz.common.tasks.boot.BlackListModules, + bootstrapvz.common.tasks.boot.DisableGetTTYs, + boot.AddXenGrubConsoleOutputDevice, + bootstrapvz.common.tasks.grub.WriteGrubConfig, + boot.UpdateGrubConfig, + bootstrapvz.common.tasks.initd.AddExpandRoot, + bootstrapvz.common.tasks.initd.RemoveHWClock, + bootstrapvz.common.tasks.initd.InstallInitScripts, + ami.RegisterAMI, ]) if manifest.release > wheezy: - taskset.add(tasks.network.InstallNetworkingUDevHotplugAndDHCPSubinterface) + taskset.add(network.InstallNetworkingUDevHotplugAndDHCPSubinterface) if manifest.release <= wheezy: # The default DHCP client `isc-dhcp' doesn't work properly on wheezy and earlier - taskset.add(tasks.network.InstallDHCPCD) - taskset.add(tasks.network.EnableDHCPCDDNS) + taskset.add(network.InstallDHCPCD) + taskset.add(network.EnableDHCPCDDNS) if manifest.release >= jessie: - taskset.add(tasks.packages.AddWorkaroundGrowpart) - taskset.add(initd.AdjustGrowpartWorkaround) + taskset.add(packages.AddWorkaroundGrowpart) + taskset.add(bootstrapvz.common.tasks.initd.AdjustGrowpartWorkaround) if manifest.system['bootloader'] == 'grub': - taskset.add(grub.EnableSystemd) + taskset.add(bootstrapvz.common.tasks.grub.EnableSystemd) if manifest.release <= stable: taskset.add(apt.AddBackports) if manifest.provider.get('install_init_scripts', True): - taskset.add(tasks.initd.AddEC2InitScripts) + taskset.add(initd.AddEC2InitScripts) if manifest.volume['partitions']['type'] != 'none': - taskset.add(initd.AdjustExpandRootScript) + taskset.add(bootstrapvz.common.tasks.initd.AdjustExpandRootScript) if manifest.system['bootloader'] == 'pvgrub': - taskset.add(grub.AddGrubPackage) - taskset.update([grub.AddGrubPackage, - grub.InitGrubConfig, - grub.SetGrubTerminalToConsole, - grub.SetGrubConsolOutputDeviceToSerial, - grub.RemoveGrubTimeout, - grub.DisableGrubRecovery, - tasks.boot.CreatePVGrubCustomRule, - tasks.boot.ConfigurePVGrub, - grub.WriteGrubConfig, - tasks.boot.UpdateGrubConfig, - tasks.boot.LinkGrubConfig]) + taskset.add(bootstrapvz.common.tasks.grub.AddGrubPackage) + taskset.update([bootstrapvz.common.tasks.grub.AddGrubPackage, + bootstrapvz.common.tasks.grub.InitGrubConfig, + bootstrapvz.common.tasks.grub.SetGrubTerminalToConsole, + bootstrapvz.common.tasks.grub.SetGrubConsolOutputDeviceToSerial, + bootstrapvz.common.tasks.grub.RemoveGrubTimeout, + bootstrapvz.common.tasks.grub.DisableGrubRecovery, + boot.CreatePVGrubCustomRule, + boot.ConfigurePVGrub, + bootstrapvz.common.tasks.grub.WriteGrubConfig, + boot.UpdateGrubConfig, + boot.LinkGrubConfig]) if manifest.volume['backing'].lower() == 'ebs': - taskset.update([tasks.host.GetInstanceMetadata, - tasks.ebs.Create, - tasks.ebs.Snapshot, + taskset.update([host.GetInstanceMetadata, + ebs.Create, + ebs.Snapshot, ]) - taskset.add(tasks.ebs.Attach) + taskset.add(ebs.Attach) taskset.discard(volume.Attach) if manifest.volume['backing'].lower() == 's3': taskset.update([loopback.AddRequiredCommands, - tasks.host.SetRegion, + host.SetRegion, loopback.Create, - tasks.filesystem.S3FStab, - tasks.ami.BundleImage, - tasks.ami.UploadImage, - tasks.ami.RemoveBundle, + filesystem.S3FStab, + ami.BundleImage, + ami.UploadImage, + ami.RemoveBundle, ]) - taskset.discard(filesystem.FStab) + taskset.discard(bootstrapvz.common.tasks.filesystem.FStab) if manifest.provider.get('enhanced_networking', None) == 'simple': taskset.update([kernel.AddDKMSPackages, - tasks.network.InstallEnhancedNetworking, - tasks.network.InstallENANetworking, + network.InstallEnhancedNetworking, + network.InstallENANetworking, kernel.UpdateInitramfs]) - taskset.update([filesystem.Format, + taskset.update([bootstrapvz.common.tasks.filesystem.Format, volume.Delete, ]) def resolve_rollback_tasks(taskset, manifest, completed, counter_task): taskset.update(task_groups.get_standard_rollback_tasks(completed)) - counter_task(taskset, tasks.ebs.Create, volume.Delete) - counter_task(taskset, tasks.ebs.Attach, volume.Detach) - counter_task(taskset, tasks.ami.BundleImage, tasks.ami.RemoveBundle) + counter_task(taskset, ebs.Create, volume.Delete) + counter_task(taskset, ebs.Attach, volume.Detach) + counter_task(taskset, ami.BundleImage, ami.RemoveBundle) diff --git a/bootstrapvz/providers/gce/__init__.py b/bootstrapvz/providers/gce/__init__.py index b69b457..c31262e 100644 --- a/bootstrapvz/providers/gce/__init__.py +++ b/bootstrapvz/providers/gce/__init__.py @@ -1,11 +1,9 @@ +import bootstrapvz.common.tasks.apt +import bootstrapvz.common.tasks.boot +import bootstrapvz.common.tasks.image +from bootstrapvz.common.tasks import loopback, initd, ssh, volume, grub from bootstrapvz.common import task_groups -from . import tasks.apt -from . import tasks.boot -from . import tasks.configuration -from . import tasks.image -from . import tasks.packages -from bootstrapvz.common.tasks import apt, boot, image, loopback, initd -from bootstrapvz.common.tasks import ssh, volume, grub +from .tasks import apt, boot, configuration, image, packages def validate_manifest(data, validator, error): @@ -15,30 +13,30 @@ def validate_manifest(data, validator, error): def resolve_tasks(taskset, manifest): taskset.update(task_groups.get_standard_groups(manifest)) - taskset.update([apt.AddBackports, - apt.AddDefaultSources, + taskset.update([bootstrapvz.common.tasks.apt.AddBackports, + bootstrapvz.common.tasks.apt.AddDefaultSources, loopback.AddRequiredCommands, loopback.Create, - tasks.packages.DefaultPackages, - tasks.configuration.GatherReleaseInformation, - tasks.boot.ConfigureGrub, + packages.DefaultPackages, + configuration.GatherReleaseInformation, + boot.ConfigureGrub, initd.InstallInitScripts, - boot.BlackListModules, - boot.UpdateInitramfs, + bootstrapvz.common.tasks.boot.BlackListModules, + bootstrapvz.common.tasks.boot.UpdateInitramfs, ssh.AddSSHKeyGeneration, ssh.DisableSSHPasswordAuthentication, ssh.DisableRootLogin, - tasks.apt.AddBaselineAptCache, - image.MoveImage, - tasks.image.CreateTarball, + apt.AddBaselineAptCache, + bootstrapvz.common.tasks.image.MoveImage, + image.CreateTarball, volume.Delete, ]) taskset.discard(grub.SetGrubConsolOutputDeviceToSerial) if 'gcs_destination' in manifest.provider: - taskset.add(tasks.image.UploadImage) + taskset.add(image.UploadImage) if 'gce_project' in manifest.provider: - taskset.add(tasks.image.RegisterImage) + taskset.add(image.RegisterImage) def resolve_rollback_tasks(taskset, manifest, completed, counter_task): diff --git a/bootstrapvz/providers/kvm/__init__.py b/bootstrapvz/providers/kvm/__init__.py index 3be8bf7..2674f4f 100644 --- a/bootstrapvz/providers/kvm/__init__.py +++ b/bootstrapvz/providers/kvm/__init__.py @@ -1,7 +1,6 @@ from bootstrapvz.common import task_groups -from . import tasks.packages -from . import tasks.boot from bootstrapvz.common.tasks import image, loopback, initd, ssh, logicalvolume +from .tasks import packages, boot def validate_manifest(data, validator, error): @@ -12,7 +11,7 @@ def validate_manifest(data, validator, error): def resolve_tasks(taskset, manifest): taskset.update(task_groups.get_standard_groups(manifest)) - taskset.update([tasks.packages.DefaultPackages, + taskset.update([packages.DefaultPackages, initd.InstallInitScripts, ssh.AddOpenSSHPackage, ssh.ShredHostkeys, @@ -34,12 +33,12 @@ def resolve_tasks(taskset, manifest): if manifest.provider.get('console', False): if manifest.provider['console'] == 'virtual': - taskset.update([tasks.boot.SetGrubConsolOutputDeviceToVirtual]) + taskset.update([boot.SetGrubConsolOutputDeviceToVirtual]) from bootstrapvz.common.releases import jessie if manifest.release >= jessie: - taskset.update([tasks.boot.SetGrubConsolOutputDeviceToVirtual, - tasks.boot.SetSystemdTTYVTDisallocate, + taskset.update([boot.SetGrubConsolOutputDeviceToVirtual, + boot.SetSystemdTTYVTDisallocate, ]) diff --git a/bootstrapvz/providers/oracle/__init__.py b/bootstrapvz/providers/oracle/__init__.py index cd96922..3ae8fbc 100644 --- a/bootstrapvz/providers/oracle/__init__.py +++ b/bootstrapvz/providers/oracle/__init__.py @@ -1,9 +1,7 @@ +import bootstrapvz.common.tasks.image from bootstrapvz.common import task_groups -from bootstrapvz.common.tasks import image, loopback, ssh, volume -from . import tasks.api -from . import tasks.image -from . import tasks.network -from . import tasks.packages +from bootstrapvz.common.tasks import loopback, ssh, volume +from .tasks import api, image, network, packages def validate_manifest(data, validator, error): @@ -26,20 +24,20 @@ def resolve_tasks(taskset, manifest): taskset.update([loopback.AddRequiredCommands, loopback.Create, - image.MoveImage, + bootstrapvz.common.tasks.image.MoveImage, ssh.DisableRootLogin, volume.Delete, - tasks.image.CreateImageTarball, - tasks.network.InstallDHCPCD, - tasks.packages.DefaultPackages, + image.CreateImageTarball, + network.InstallDHCPCD, + packages.DefaultPackages, ]) if 'credentials' in manifest.provider: - taskset.add(tasks.api.Connect) - taskset.add(tasks.image.UploadImageTarball) + taskset.add(api.Connect) + taskset.add(image.UploadImageTarball) if manifest.provider.get('verify', False): - taskset.add(tasks.image.DownloadImageTarball) - taskset.add(tasks.image.CompareImageTarballs) + taskset.add(image.DownloadImageTarball) + taskset.add(image.CompareImageTarballs) def resolve_rollback_tasks(taskset, manifest, completed, counter_task): diff --git a/bootstrapvz/providers/virtualbox/__init__.py b/bootstrapvz/providers/virtualbox/__init__.py index 2459cd4..02d8d8f 100644 --- a/bootstrapvz/providers/virtualbox/__init__.py +++ b/bootstrapvz/providers/virtualbox/__init__.py @@ -1,8 +1,7 @@ from bootstrapvz.common import task_groups -from . import tasks.packages -from . import tasks.boot from bootstrapvz.common.tasks import image from bootstrapvz.common.tasks import loopback +from .tasks import packages, boot def validate_manifest(data, validator, error): @@ -13,8 +12,8 @@ def validate_manifest(data, validator, error): def resolve_tasks(taskset, manifest): taskset.update(task_groups.get_standard_groups(manifest)) - taskset.update([tasks.packages.DefaultPackages, - tasks.boot.AddVirtualConsoleGrubOutputDevice, + taskset.update([packages.DefaultPackages, + boot.AddVirtualConsoleGrubOutputDevice, loopback.AddRequiredCommands, loopback.Create, image.MoveImage, diff --git a/pylintrc b/pylintrc index 414f0f5..bdc99d4 100644 --- a/pylintrc +++ b/pylintrc @@ -27,7 +27,7 @@ load-plugins= # Enable the message, report, category or checker with the given id(s). You can # either give multiple identifier separated by comma (,) or put this option # multiple time. -enable=W0401,W0611 +enable=W0401,W0403,W0611 # Disable the message, report, category or checker with the given id(s). You # can either give multiple identifier separated by comma (,) or put this option