Skip to content

Commit 354cda0

Browse files
authored
Address ruff S, EXE skips (#3889)
1 parent e0419ba commit 354cda0

File tree

8 files changed

+7
-10
lines changed

8 files changed

+7
-10
lines changed

pyproject.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,17 +161,15 @@ ignore = [
161161
"FBT", # Boolean positional value in function call
162162
# Temporary disabled until we fix them:
163163
"A",
164-
"ANN",
164+
"ANN", # Annotations
165165
"ARG",
166166
"B",
167167
"BLE001",
168168
"C901",
169169
"D",
170170
"E741",
171171
"EM",
172-
"EXE",
173172
"INP",
174-
"ISC",
175173
"N",
176174
"PGH",
177175
"PLR",

src/molecule/command/init/scenario.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def _role_exists(ctx, param, value: str): # pragma: no cover
125125

126126
role_directory = os.path.join(os.pardir, value)
127127
if not os.path.exists(role_directory):
128-
msg = f"The role '{value}' not found. " "Please choose the proper role name."
128+
msg = f"The role '{value}' not found. Please choose the proper role name."
129129
util.sysexit_with_message(msg)
130130
return value
131131

src/molecule/command/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def execute(self, action_args=None):
7575
"--destroy",
7676
type=click.Choice(["always", "never"]),
7777
default="always",
78-
help=("The destroy strategy used at the conclusion of a " "Molecule run (always)."),
78+
help=("The destroy strategy used at the conclusion of a Molecule run (always)."),
7979
)
8080
@click.option(
8181
"--parallel/--no-parallel",

src/molecule/provisioner/ansible.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ def _verify_inventory(self):
947947
:return: None
948948
"""
949949
if not self.inventory:
950-
msg = "Instances missing from the 'platform' " + "section of molecule.yml."
950+
msg = "Instances missing from the 'platform' section of molecule.yml."
951951
util.sysexit_with_message(msg)
952952

953953
def _get_config_template(self):

src/molecule/shell.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def print_version(ctx, param, value):
106106
"--env-file",
107107
"-e",
108108
default=ENV_FILE,
109-
help=("The file to read variables from when rendering molecule.yml. " "(.env.yml)"),
109+
help=("The file to read variables from when rendering molecule.yml. (.env.yml)"),
110110
)
111111
@click.option(
112112
"--version",

src/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/tests/test_testinfra_pre_commit.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/python
21
"""Testinfra tests."""
32

43

src/molecule/test/unit/command/test_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ def test_runtime_paths(config_instance, _patched_sysexit):
244244
)
245245

246246
assert runtime_collections_path.startswith(
247-
f"{cache_dir}/collections:" f"{home}/.ansible/collections",
247+
f"{cache_dir}/collections:{home}/.ansible/collections",
248248
)
249249

250250
assert provisioner_roles_path.startswith(f"{cache_dir}/roles")

src/molecule/test/unit/dependency/ansible_galaxy/test_roles.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
@pytest.fixture()
3030
def _patched_ansible_galaxy_has_requirements_file(mocker):
3131
m = mocker.patch(
32-
"molecule.dependency.ansible_galaxy.roles." + "Roles._has_requirements_file",
32+
"molecule.dependency.ansible_galaxy.roles.Roles._has_requirements_file",
3333
)
3434
m.return_value = True
3535

0 commit comments

Comments
 (0)