Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .config/requirements-lock.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ platformdirs==4.4.0
# via black
pycparser==2.23 ; implementation_name != 'PyPy'
# via cffi
pyyaml==6.0.2
pyyaml==6.0.3
# via
# ansible-compat
# ansible-core
Expand Down
13 changes: 13 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ classifiers = [
dependencies = [
"ansible-compat>=25.8.0", # indirect dependency of cryptography
"ansible-core>=2.16.11", # indirect dependency of ansible-core
"ansible-core>=2.20.0b1 ; python_full_version >= '3.14'", # indirect dependency of ansible-core
"black>=24.3.0", # indirect dependency of ansible-core
"cffi>=1.17.1", # indirect dependency of ruamel-yaml
"cryptography>=38",
Expand All @@ -44,6 +45,7 @@ dependencies = [
"packaging>=22.0",
"pathspec>=0.10.3",
"pyyaml>=6.0.2",
"pyyaml>=6.0.3 ; python_full_version < '3.14'", # py314 support
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

>=?

"referencing>=0.36.2",
"ruamel-yaml>=0.18.11",
"ruamel-yaml-clib>=0.2.12 ; python_full_version < '3.14'",
Expand Down Expand Up @@ -760,6 +762,17 @@ runner = "uv-venv-runner"
uv_sync_flags = ["--upgrade", "--prerelease=allow"]
uv_sync_locked = false

[tool.tox.env.py314-devel]
dependency_groups = ["dev"]
deps = [
"ansible-compat @ git+https://github.com/ansible/ansible-compat.git",
"ansible-core @ git+https://github.com/ansible/ansible.git",
]
description = "Run the tests with newest dependencies (no lock and allowing prereleases)"
runner = "uv-venv-runner"
uv_sync_flags = ["--upgrade", "--prerelease=allow"]
uv_sync_locked = false

[tool.tox.env.redirects]
commands = [
[
Expand Down
2 changes: 2 additions & 0 deletions src/ansiblelint/requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ def __init__(self, name: str = "ansible-lint") -> None:
for req_str in metadata.json["requires_dist"]:
req = Requirement(req_str)
if req.name:
if req.marker and not req.marker.evaluate():
continue
self[req.name] = req.specifier

def matches(self, req_name: str, req_version: str | Version) -> bool:
Expand Down
6 changes: 5 additions & 1 deletion src/ansiblelint/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@
import ruamel.yaml.parser
import yaml
from ansible.errors import AnsibleError, AnsibleParserError
from ansible.module_utils._text import to_bytes

try:
from ansible.module_utils.common.text.converters import to_bytes
except ImportError: # pragma: no branch
from ansible.module_utils._text import to_bytes
from ansible.module_utils.parsing.convert_bool import boolean
from ansible.parsing.dataloader import DataLoader
from ansible.parsing.mod_args import ModuleArgsParser
Expand Down
Loading
Loading