Skip to content

Commit

Permalink
resort imports
Browse files Browse the repository at this point in the history
  • Loading branch information
mhecko committed Aug 15, 2023
1 parent b4de6bc commit 462eaad
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from leapp.libraries.common.config import architecture
from leapp.libraries.common.testutils import create_report_mocked, CurrentActorMocked, logger_mocked
from leapp.libraries.stdlib import api
from leapp.models import InstalledRedHatSignedRPM, RPM, KernelInfo
from leapp.models import InstalledRedHatSignedRPM, KernelInfo, RPM

RH_PACKAGER = 'Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla>'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from leapp.libraries.stdlib import api
from leapp.models import InstalledTargetKernelInfo, KernelCmdlineArg, TargetKernelCmdlineArgTasks


TARGET_KERNEL_NEVRA = 'kernel-core-1.2.3-4.x86_64.el8.x64_64'


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from leapp.actors import Actor
from leapp.libraries.actor import scankernel
from leapp.models import InstalledTargetKernelVersion, InstalledTargetKernelInfo, TransactionCompleted, KernelInfo
from leapp.models import InstalledTargetKernelInfo, InstalledTargetKernelVersion, KernelInfo, TransactionCompleted
from leapp.tags import IPUWorkflowTag, RPMUpgradePhaseTag


Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
from collections import namedtuple
import os
from collections import namedtuple

from leapp.exceptions import StopActorExecutionError
from leapp.libraries.common import kernel as kernel_lib
from leapp.libraries.common.config.version import get_target_major_version
from leapp.libraries.stdlib import api, CalledProcessError, run
from leapp.models import InstalledTargetKernelInfo, InstalledTargetKernelVersion, KernelInfo


KernelBootFiles = namedtuple('KernelBootFiles', ('vmlinuz_path', 'initramfs_path'))


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
from leapp.exceptions import StopActorExecutionError
from leapp.libraries import stdlib
from leapp.libraries.actor import scankernel
from leapp.libraries.common import kernel as kernel_lib
from leapp.libraries.common.testutils import CurrentActorMocked, logger_mocked
from leapp.libraries.stdlib import api
from leapp.models import KernelInfo, RPM, InstalledTargetKernelInfo, InstalledTargetKernelVersion
from leapp.libraries.common import kernel as kernel_lib
from leapp.models import InstalledTargetKernelInfo, InstalledTargetKernelVersion, KernelInfo, RPM

TARGET_KERNEL_NEVRA = 'kernel-core-1.2.3-4.el9.x86_64'
TARGET_RT_KERNEL_NEVRA = 'kernel-rt-core-1.2.3-4.rt56.7.el9.x86_64'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from leapp.actors import Actor
from leapp.libraries.actor import scan_source_kernel as scan_source_kernel_lib
from leapp.models import InstalledRPM, KernelInfo
from leapp.tags import FactsPhaseTag, IPUWorkflowTag
from leapp.libraries.actor import scan_source_kernel as scan_source_kernel_lib


class ScanSourceKernel(Actor):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import itertools

from leapp.exceptions import StopActorExecutionError
from leapp.libraries.stdlib import api
from leapp.libraries.common import kernel as kernel_lib
from leapp.libraries.common.config.version import get_source_major_version, get_source_minor_version
from leapp.libraries.stdlib import api
from leapp.models import InstalledRPM, KernelInfo


Expand Down
3 changes: 1 addition & 2 deletions repos/system_upgrade/common/libraries/kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
from collections import namedtuple

from leapp.exceptions import StopActorExecutionError
from leapp.libraries.stdlib import CalledProcessError, run, api

from leapp.libraries.stdlib import api, CalledProcessError, run

KernelPkgInfo = namedtuple('KernelPkgInfo', ('name', 'version', 'release', 'arch', 'nevra'))

Expand Down

0 comments on commit 462eaad

Please sign in to comment.