Skip to content

Commit

Permalink
ruff: enable ruff linter I (isort) and re-format with ruff isort
Browse files Browse the repository at this point in the history
  • Loading branch information
mirecheck committed Jan 14, 2025
1 parent 8aceff6 commit 0878eee
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 29 deletions.
3 changes: 1 addition & 2 deletions pcs/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,8 @@
from pcs.lib import sbd as lib_sbd
from pcs.lib.commands.remote_node import _destroy_pcmk_remote_env
from pcs.lib.communication.nodes import CheckAuth
from pcs.lib.communication.tools import RunRemotelyBase
from pcs.lib.communication.tools import RunRemotelyBase, run_and_raise
from pcs.lib.communication.tools import run as run_com_cmd
from pcs.lib.communication.tools import run_and_raise
from pcs.lib.corosync import qdevice_net
from pcs.lib.corosync.live import (
QuorumStatusException,
Expand Down
2 changes: 1 addition & 1 deletion pcs/daemon/app/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
from tornado.web import (
Finish,
HTTPError,
RequestHandler,
)
from tornado.web import RedirectHandler as TornadoRedirectHandler
from tornado.web import RequestHandler

RoutesType = Iterable[
tuple[str, Type[RequestHandler], Optional[dict[str, Any]]]
Expand Down
4 changes: 1 addition & 3 deletions pcs/daemon/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@
api_v1,
api_v2,
auth,
)
from pcs.daemon.app import capabilities as capabilities_app
from pcs.daemon.app import (
sinatra_remote,
sinatra_ui,
ui,
)
from pcs.daemon.app import capabilities as capabilities_app
from pcs.daemon.app.common import (
Http404Handler,
RedirectHandler,
Expand Down
2 changes: 1 addition & 1 deletion pcs/lib/cib/fencing_topology.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
ReportItemList,
ReportItemSeverity,
ReportProcessor,
has_errors,
)
from pcs.common.reports import codes as report_codes
from pcs.common.reports import has_errors
from pcs.common.reports.item import ReportItem
from pcs.common.types import StringSequence
from pcs.common.validate import is_integer
Expand Down
5 changes: 2 additions & 3 deletions pcs/lib/commands/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,15 @@
EnableSbdService,
SetSbdConfig,
)
from pcs.lib.communication.tools import AllSameDataMixin
from pcs.lib.communication.tools import AllSameDataMixin, run_and_raise
from pcs.lib.communication.tools import run as run_com
from pcs.lib.communication.tools import run_and_raise
from pcs.lib.corosync import (
config_facade,
config_parser,
config_validators,
qdevice_net,
)
from pcs.lib.corosync import constants as corosync_constants
from pcs.lib.corosync import qdevice_net
from pcs.lib.env import (
LibraryEnvironment,
WaitType,
Expand Down
2 changes: 1 addition & 1 deletion pcs/lib/commands/cluster_property.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
ResourceAgentError,
ResourceAgentFacade,
ResourceAgentMetadata,
resource_agent_error_to_report_item,
)
from pcs.lib.resource_agent import const as ra_const
from pcs.lib.resource_agent import resource_agent_error_to_report_item
from pcs.lib.resource_agent.facade import ResourceAgentFacadeFactory


Expand Down
4 changes: 2 additions & 2 deletions pcs/lib/file/raw_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
# places
# pylint: disable=unused-import
from pcs.common import reports
from pcs.common.file import FileMetadata
from pcs.common.file import RawFile as RealFile
from pcs.common.file import (
FileMetadata,
RawFileError,
RawFileInterface,
)
from pcs.common.file import RawFile as RealFile

# TODO add logging (logger / debug reports ?)

Expand Down
6 changes: 2 additions & 4 deletions pcs/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,10 @@
timeout_to_seconds_legacy,
)
from pcs.cli.file import metadata as cli_file_metadata
from pcs.cli.reports import ReportProcessorToConsole
from pcs.cli.reports import ReportProcessorToConsole, process_library_reports
from pcs.cli.reports import output as reports_output
from pcs.cli.reports import process_library_reports
from pcs.common import const
from pcs.common import const, file_type_codes
from pcs.common import file as pcs_file
from pcs.common import file_type_codes
from pcs.common import pacemaker as common_pacemaker
from pcs.common import pcs_pycurl as pycurl
from pcs.common.host import PcsKnownHost
Expand Down
4 changes: 2 additions & 2 deletions pcs_test/tier1/legacy/test_alert.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import unittest

from pcs_test.tools.assertions import AssertPcsMixin
from pcs_test.tools.misc import ParametrizedTestMetaClass
from pcs_test.tools.misc import get_test_resource as rc
from pcs_test.tools.misc import (
ParametrizedTestMetaClass,
get_tmp_file,
outdent,
write_file_to_tmpfile,
)
from pcs_test.tools.misc import get_test_resource as rc
from pcs_test.tools.pcs_runner import PcsRunner

empty_cib = rc("cib-empty.xml")
Expand Down
4 changes: 2 additions & 2 deletions pcs_test/tier1/legacy/test_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
from unittest import TestCase

from pcs_test.tools.assertions import AssertPcsMixin
from pcs_test.tools.misc import compare_version
from pcs_test.tools.misc import get_test_resource as rc
from pcs_test.tools.misc import (
compare_version,
get_tmp_dir,
get_tmp_file,
outdent,
read_test_resource,
skip_unless_root,
write_file_to_tmpfile,
)
from pcs_test.tools.misc import get_test_resource as rc
from pcs_test.tools.pcs_runner import (
PcsRunner,
pcs,
Expand Down
4 changes: 2 additions & 2 deletions pcs_test/tier1/legacy/test_constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
wrap_element_by_master,
wrap_element_by_master_file,
)
from pcs_test.tools.misc import ParametrizedTestMetaClass
from pcs_test.tools.misc import get_test_resource as rc
from pcs_test.tools.misc import (
ParametrizedTestMetaClass,
get_tmp_file,
outdent,
skip_unless_crm_rule,
write_file_to_tmpfile,
)
from pcs_test.tools.misc import get_test_resource as rc
from pcs_test.tools.pcs_runner import (
PcsRunner,
pcs,
Expand Down
4 changes: 2 additions & 2 deletions pcs_test/tier1/legacy/test_stonith.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
from pcs_test.tools.assertions import AssertPcsMixin
from pcs_test.tools.bin_mock import get_mock_settings
from pcs_test.tools.fixture_cib import CachedCibFixture
from pcs_test.tools.misc import ParametrizedTestMetaClass
from pcs_test.tools.misc import get_test_resource as rc
from pcs_test.tools.misc import (
ParametrizedTestMetaClass,
get_tmp_file,
is_minimum_pacemaker_version,
outdent,
skip_unless_crm_rule,
write_data_to_tmpfile,
write_file_to_tmpfile,
)
from pcs_test.tools.misc import get_test_resource as rc
from pcs_test.tools.pcs_runner import PcsRunner

PCMK_2_0_3_PLUS = is_minimum_pacemaker_version(2, 0, 3)
Expand Down
3 changes: 1 addition & 2 deletions pcs_test/tier1/test_cluster_pcmk_remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

from pcs_test.tier1.cib_resource.common import ResourceTest
from pcs_test.tools.bin_mock import get_mock_settings
from pcs_test.tools.misc import ParametrizedTestMetaClass
from pcs_test.tools.misc import ParametrizedTestMetaClass, write_data_to_tmpfile
from pcs_test.tools.misc import get_test_resource as rc
from pcs_test.tools.misc import write_data_to_tmpfile

ERRORS_HAVE_OCCURRED = (
"Error: Errors have occurred, therefore pcs is unable to continue\n"
Expand Down
4 changes: 2 additions & 2 deletions pcs_test/tier1/test_quorum.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
from unittest import TestCase

from pcs_test.tools.assertions import AssertPcsMixin
from pcs_test.tools.misc import ParametrizedTestMetaClass
from pcs_test.tools.misc import get_test_resource as rc
from pcs_test.tools.misc import (
ParametrizedTestMetaClass,
get_tmp_file,
write_file_to_tmpfile,
)
from pcs_test.tools.misc import get_test_resource as rc
from pcs_test.tools.pcs_runner import PcsRunner

coro_conf = rc("corosync.conf")
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ target-version = "py39"
# ruff rules docs: https://docs.astral.sh/ruff/rules/
# pylint rules in ruff: # https://github.com/astral-sh/ruff/issues/970
select = [
"I",
"PL", # pylint convention, error, refactoring, warning
]
# ruff does not respect pylint ignore directives
Expand Down

0 comments on commit 0878eee

Please sign in to comment.