Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,9 @@ repos:
hooks:
- id: mypy
# "." and pass_files are used to make pre-commit mypy behave the same as standalone mypy
args: ["."]
args:
- --python-version=3.12
- .
pass_filenames: false
additional_dependencies: &deps
- ansible-compat>=25.8.0
Expand Down
11 changes: 4 additions & 7 deletions src/ansiblelint/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,7 @@
try:
from ansible.module_utils.common.text.converters import to_bytes
except ImportError: # pragma: no branch
from ansible.module_utils._text import ( # type: ignore[no-redef,unused-ignore]
to_bytes,
)

from ansible.module_utils._text import to_bytes # type: ignore[no-redef]
from ansible.module_utils.parsing.convert_bool import boolean
from ansible.parsing.dataloader import DataLoader
from ansible.parsing.mod_args import ModuleArgsParser
Expand Down Expand Up @@ -122,7 +119,7 @@

def parse_yaml_from_file(filepath: str) -> AnsibleJSON:
"""Extract a decrypted YAML object from file."""
dataloader = DataLoader() # type: ignore[no-untyped-call,unused-ignore]
dataloader = DataLoader()
if hasattr(dataloader, "set_vault_secrets"):
dataloader.set_vault_secrets([
("default", PromptVaultSecret(_bytes=to_bytes(DEFAULT_VAULT_PASSWORD))) # type: ignore[no-untyped-call]
Expand All @@ -139,7 +136,7 @@ def parse_yaml_from_file(filepath: str) -> AnsibleJSON:

def path_dwim(basedir: str, given: str) -> str:
"""Convert a given path do-what-I-mean style."""
dataloader = DataLoader() # type: ignore[no-untyped-call,unused-ignore]
dataloader = DataLoader()
dataloader.set_basedir(basedir)
return str(dataloader.path_dwim(given))

Expand All @@ -154,7 +151,7 @@ def ansible_templar(basedir: Path, templatevars: Any) -> Templar:
if basedir.name == "tasks":
basedir = basedir.parent

dataloader = DataLoader() # type: ignore[no-untyped-call,unused-ignore]
dataloader = DataLoader()
dataloader.set_basedir(str(basedir))
templar = Templar(dataloader, variables=templatevars)
return templar
Expand Down