132 lines
6.3 KiB
Diff
132 lines
6.3 KiB
Diff
From c5451ffb9a5c964552afd9d419855ea23b764ad7 Mon Sep 17 00:00:00 2001
|
|
From: Inessa Vasilevskaya <ivasilev@redhat.com>
|
|
Date: Wed, 24 Aug 2022 12:17:44 +0200
|
|
Subject: [PATCH 05/32] Disable isort check for deprecated imports
|
|
|
|
Although isort works fine most of the time, the way it handles
|
|
multiline imports with inline comments is not acceptable
|
|
to everyone in the team.
|
|
So before we implement some solution we are 146% happy about
|
|
it was decided to leave those imports just as they have been for
|
|
ages. This patch mutes isort import check for deprecated imports.
|
|
---
|
|
.../common/actors/commonleappdracutmodules/actor.py | 7 ++++---
|
|
.../actors/commonleappdracutmodules/libraries/modscan.py | 5 +++--
|
|
.../tests/test_modscan_commonleappdracutmodules.py | 5 +++--
|
|
.../tests/test_targetinitramfsgenerator.py | 5 +++--
|
|
.../tests/unit_test_upgradeinitramfsgenerator.py | 5 +++--
|
|
5 files changed, 16 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/repos/system_upgrade/common/actors/commonleappdracutmodules/actor.py b/repos/system_upgrade/common/actors/commonleappdracutmodules/actor.py
|
|
index 950b6e88..aae42bbb 100644
|
|
--- a/repos/system_upgrade/common/actors/commonleappdracutmodules/actor.py
|
|
+++ b/repos/system_upgrade/common/actors/commonleappdracutmodules/actor.py
|
|
@@ -1,13 +1,14 @@
|
|
from leapp.actors import Actor
|
|
from leapp.libraries.actor import modscan
|
|
-from leapp.models import (
|
|
+from leapp.tags import FactsPhaseTag, IPUWorkflowTag
|
|
+from leapp.utils.deprecation import suppress_deprecation
|
|
+
|
|
+from leapp.models import ( # isort:skip
|
|
RequiredUpgradeInitramPackages, # deprecated
|
|
UpgradeDracutModule, # deprecated
|
|
TargetUserSpaceUpgradeTasks,
|
|
UpgradeInitramfsTasks
|
|
)
|
|
-from leapp.tags import FactsPhaseTag, IPUWorkflowTag
|
|
-from leapp.utils.deprecation import suppress_deprecation
|
|
|
|
|
|
@suppress_deprecation(RequiredUpgradeInitramPackages, UpgradeDracutModule)
|
|
diff --git a/repos/system_upgrade/common/actors/commonleappdracutmodules/libraries/modscan.py b/repos/system_upgrade/common/actors/commonleappdracutmodules/libraries/modscan.py
|
|
index a089c4c1..275b2c63 100644
|
|
--- a/repos/system_upgrade/common/actors/commonleappdracutmodules/libraries/modscan.py
|
|
+++ b/repos/system_upgrade/common/actors/commonleappdracutmodules/libraries/modscan.py
|
|
@@ -3,14 +3,15 @@ import re
|
|
|
|
from leapp.libraries.common.config import architecture, version
|
|
from leapp.libraries.stdlib import api
|
|
-from leapp.models import (
|
|
+from leapp.utils.deprecation import suppress_deprecation
|
|
+
|
|
+from leapp.models import ( # isort:skip
|
|
RequiredUpgradeInitramPackages, # deprecated
|
|
UpgradeDracutModule, # deprecated
|
|
DracutModule,
|
|
TargetUserSpaceUpgradeTasks,
|
|
UpgradeInitramfsTasks
|
|
)
|
|
-from leapp.utils.deprecation import suppress_deprecation
|
|
|
|
_REQUIRED_PACKAGES = [
|
|
'binutils',
|
|
diff --git a/repos/system_upgrade/common/actors/commonleappdracutmodules/tests/test_modscan_commonleappdracutmodules.py b/repos/system_upgrade/common/actors/commonleappdracutmodules/tests/test_modscan_commonleappdracutmodules.py
|
|
index 307e927c..9c52b51f 100644
|
|
--- a/repos/system_upgrade/common/actors/commonleappdracutmodules/tests/test_modscan_commonleappdracutmodules.py
|
|
+++ b/repos/system_upgrade/common/actors/commonleappdracutmodules/tests/test_modscan_commonleappdracutmodules.py
|
|
@@ -8,13 +8,14 @@ from leapp.libraries.actor import modscan
|
|
from leapp.libraries.common.config import architecture
|
|
from leapp.libraries.common.testutils import CurrentActorMocked
|
|
from leapp.libraries.stdlib import api
|
|
-from leapp.models import (
|
|
+from leapp.utils.deprecation import suppress_deprecation
|
|
+
|
|
+from leapp.models import ( # isort:skip
|
|
RequiredUpgradeInitramPackages, # deprecated
|
|
UpgradeDracutModule, # deprecated
|
|
TargetUserSpaceUpgradeTasks,
|
|
UpgradeInitramfsTasks
|
|
)
|
|
-from leapp.utils.deprecation import suppress_deprecation
|
|
|
|
|
|
def _files_get_folder_path(name):
|
|
diff --git a/repos/system_upgrade/common/actors/initramfs/targetinitramfsgenerator/tests/test_targetinitramfsgenerator.py b/repos/system_upgrade/common/actors/initramfs/targetinitramfsgenerator/tests/test_targetinitramfsgenerator.py
|
|
index 98fe92c6..f5930b9b 100644
|
|
--- a/repos/system_upgrade/common/actors/initramfs/targetinitramfsgenerator/tests/test_targetinitramfsgenerator.py
|
|
+++ b/repos/system_upgrade/common/actors/initramfs/targetinitramfsgenerator/tests/test_targetinitramfsgenerator.py
|
|
@@ -4,13 +4,14 @@ from leapp.exceptions import StopActorExecutionError
|
|
from leapp.libraries.actor import targetinitramfsgenerator
|
|
from leapp.libraries.common.testutils import CurrentActorMocked, logger_mocked
|
|
from leapp.libraries.stdlib import api, CalledProcessError
|
|
-from leapp.models import (
|
|
+from leapp.utils.deprecation import suppress_deprecation
|
|
+
|
|
+from leapp.models import ( # isort:skip
|
|
InitrdIncludes, # deprecated
|
|
DracutModule,
|
|
InstalledTargetKernelVersion,
|
|
TargetInitramfsTasks
|
|
)
|
|
-from leapp.utils.deprecation import suppress_deprecation
|
|
|
|
FILES = ['/file1', '/file2', '/dir/ect/ory/file3', '/file4', '/file5']
|
|
MODULES = [
|
|
diff --git a/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/tests/unit_test_upgradeinitramfsgenerator.py b/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/tests/unit_test_upgradeinitramfsgenerator.py
|
|
index b54aaa1f..2b401e52 100644
|
|
--- a/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/tests/unit_test_upgradeinitramfsgenerator.py
|
|
+++ b/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/tests/unit_test_upgradeinitramfsgenerator.py
|
|
@@ -7,7 +7,9 @@ from leapp.exceptions import StopActorExecutionError
|
|
from leapp.libraries.actor import upgradeinitramfsgenerator
|
|
from leapp.libraries.common.config import architecture
|
|
from leapp.libraries.common.testutils import CurrentActorMocked, logger_mocked, produce_mocked
|
|
-from leapp.models import (
|
|
+from leapp.utils.deprecation import suppress_deprecation
|
|
+
|
|
+from leapp.models import ( # isort:skip
|
|
RequiredUpgradeInitramPackages, # deprecated
|
|
UpgradeDracutModule, # deprecated
|
|
BootContent,
|
|
@@ -16,7 +18,6 @@ from leapp.models import (
|
|
TargetUserSpaceUpgradeTasks,
|
|
UpgradeInitramfsTasks,
|
|
)
|
|
-from leapp.utils.deprecation import suppress_deprecation
|
|
|
|
CUR_DIR = os.path.dirname(os.path.abspath(__file__))
|
|
PKGS = ['pkg{}'.format(c) for c in 'ABCDEFGHIJ']
|
|
--
|
|
2.38.1
|
|
|