Skip to content

Commit 9ed85af

Browse files
authored
Merge branch 'main' into update-pipefail-docs
2 parents d0ba67d + 6cab930 commit 9ed85af

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
lines changed

.config/constraints.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ asttokens==3.0.0 # via stack-data
66
attrs==25.3.0 # via jsonschema, referencing
77
babel==2.17.0 # via mkdocs-material
88
backrefs==5.8 # via mkdocs-material
9-
beautifulsoup4==4.13.3 # via linkchecker, mkdocs-htmlproofer-plugin
9+
beautifulsoup4==4.13.4 # via linkchecker, mkdocs-htmlproofer-plugin
1010
bindep==2.13.0 # via tox-extra
1111
black==25.1.0 # via ansible-lint (pyproject.toml)
1212
boolean-py==5.0 # via license-expression
1313
bracex==2.5.post1 # via wcmatch
1414
cachetools==5.5.2 # via tox
1515
cairocffi==1.7.1 # via cairosvg
1616
cairosvg==2.7.1 # via mkdocs-ansible
17-
certifi==2025.1.31 # via requests
17+
certifi==2025.4.26 # via requests
1818
cffi==1.17.1 # via cairocffi, cryptography
1919
chardet==5.2.0 # via tox
2020
charset-normalizer==3.4.1 # via requests
@@ -27,7 +27,7 @@ csscompressor==0.9.5 # via mkdocs-minify-plugin
2727
cssselect2==0.8.0 # via cairosvg
2828
decorator==5.2.1 # via ipdb, ipython
2929
defusedxml==0.7.1 # via cairosvg
30-
dill==0.3.9 # via pylint
30+
dill==0.4.0 # via pylint
3131
distlib==0.3.9 # via virtualenv
3232
distro==1.9.0 # via bindep
3333
dnspython==2.7.0 # via linkchecker
@@ -37,7 +37,7 @@ filelock==3.18.0 # via tox, virtualenv, ansible-lint (pyproject.toml)
3737
ghp-import==2.1.0 # via mkdocs
3838
gitdb==4.0.12 # via gitpython
3939
gitpython==3.1.44 # via tox-extra
40-
griffe==1.7.2 # via mkdocstrings-python
40+
griffe==1.7.3 # via mkdocstrings-python
4141
hjson==3.1.0 # via mkdocs-macros-plugin, super-collections
4242
htmlmin2==0.1.13 # via mkdocs-minify-plugin
4343
idna==3.10 # via requests
@@ -51,7 +51,7 @@ jinja2==3.1.6 # via ansible-core, mkdocs, mkdocs-macros-plugin, mkdo
5151
jmespath==1.0.1 # via ansible-lint (pyproject.toml)
5252
jsmin==3.0.1 # via mkdocs-minify-plugin
5353
jsonschema==4.23.0 # via ansible-compat, ansible-lint (pyproject.toml)
54-
jsonschema-specifications==2024.10.1 # via jsonschema
54+
jsonschema-specifications==2025.4.1 # via jsonschema
5555
license-expression==30.4.1 # via ansible-lint (pyproject.toml)
5656
linkchecker==10.5.0 # via mkdocs-ansible
5757
markdown==3.7 # via markdown-include, mkdocs, mkdocs-autorefs, mkdocs-htmlproofer-plugin, mkdocs-material, mkdocstrings, pymdown-extensions
@@ -68,14 +68,14 @@ mkdocs-gen-files==0.5.0 # via mkdocs-ansible
6868
mkdocs-get-deps==0.2.0 # via mkdocs
6969
mkdocs-htmlproofer-plugin==1.3.0 # via mkdocs-ansible
7070
mkdocs-macros-plugin==1.3.7 # via mkdocs-ansible
71-
mkdocs-material==9.6.11 # via mkdocs-ansible
71+
mkdocs-material==9.6.12 # via mkdocs-ansible
7272
mkdocs-material-extensions==1.3.1 # via mkdocs-ansible, mkdocs-material
7373
mkdocs-minify-plugin==0.8.0 # via mkdocs-ansible
7474
mkdocs-monorepo-plugin==1.1.0 # via mkdocs-ansible
7575
mkdocstrings==0.29.1 # via mkdocs-ansible, mkdocstrings-python
7676
mkdocstrings-python==1.16.10 # via mkdocs-ansible
7777
mypy==1.15.0 # via ansible-lint (pyproject.toml)
78-
mypy-extensions==1.0.0 # via black, mypy
78+
mypy-extensions==1.1.0 # via black, mypy
7979
netaddr==1.3.0 # via ansible-lint (pyproject.toml)
8080
packaging==24.2 # via ansible-compat, ansible-core, bindep, black, mkdocs, mkdocs-macros-plugin, pyproject-api, pytest, pytest-sugar, tox, tox-extra, tox-uv, ansible-lint (pyproject.toml)
8181
paginate==0.5.7 # via mkdocs-material
@@ -87,7 +87,7 @@ pexpect==4.9.0 # via ipython
8787
pillow==11.2.1 # via cairosvg, mkdocs-ansible
8888
platformdirs==4.3.7 # via black, mkdocs-get-deps, pylint, tox, virtualenv
8989
pluggy==1.5.0 # via pytest, tox
90-
prompt-toolkit==3.0.50 # via ipython
90+
prompt-toolkit==3.0.51 # via ipython
9191
psutil==7.0.0 # via pytest-xdist, ansible-lint (pyproject.toml)
9292
ptyprocess==0.7.0 # via pexpect
9393
pure-eval==0.2.3 # via stack-data
@@ -111,10 +111,10 @@ requests==2.32.3 # via linkchecker, mkdocs-htmlproofer-plugin, mkdocs-m
111111
rpds-py==0.24.0 # via jsonschema, referencing
112112
ruamel-yaml==0.18.10 # via ansible-lint (pyproject.toml)
113113
setproctitle==1.3.5 # via pytest-xdist
114-
setuptools==78.1.0 # via pbr
114+
setuptools==79.0.1 # via pbr
115115
six==1.17.0 # via python-dateutil
116116
smmap==5.0.2 # via gitdb
117-
soupsieve==2.6 # via beautifulsoup4
117+
soupsieve==2.7 # via beautifulsoup4
118118
stack-data==0.6.3 # via ipython
119119
subprocess-tee==0.4.2 # via ansible-compat, ansible-lint (pyproject.toml)
120120
super-collections==0.5.3 # via mkdocs-macros-plugin

.config/requirements-lock.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ filelock==3.18.0 # via ansible-lint (pyproject.toml)
1111
importlib-metadata==8.6.1 # via ansible-lint (pyproject.toml)
1212
jinja2==3.1.6 # via ansible-core
1313
jsonschema==4.23.0 # via ansible-compat, ansible-lint (pyproject.toml)
14-
jsonschema-specifications==2024.10.1 # via jsonschema
14+
jsonschema-specifications==2025.4.1 # via jsonschema
1515
markupsafe==3.0.2 # via jinja2
16-
mypy-extensions==1.0.0 # via black
16+
mypy-extensions==1.1.0 # via black
1717
packaging==24.2 # via ansible-compat, ansible-core, black, ansible-lint (pyproject.toml)
1818
pathspec==0.12.1 # via black, yamllint, ansible-lint (pyproject.toml)
1919
platformdirs==4.3.7 # via black

.github/workflows/tox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ jobs:
259259
fi
260260
261261
- name: Upload coverage data
262-
uses: codecov/[email protected].0
262+
uses: codecov/[email protected].2
263263
with:
264264
name: ${{ matrix.name }}
265265
# verbose: true # optional (default = false)

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ repos:
6060
6161
6262
- repo: https://github.com/streetsidesoftware/cspell-cli
63-
rev: v8.17.3
63+
rev: v8.19.0
6464
hooks:
6565
- id: cspell
6666
# entry: codespell --relative
6767
args: [--relative, --no-progress, --no-summary]
6868
name: Spell check with cspell
6969
- repo: https://github.com/python-jsonschema/check-jsonschema
70-
rev: 0.32.1
70+
rev: 0.33.0
7171
hooks:
7272
- id: check-github-workflows
7373
- repo: https://github.com/pre-commit/pre-commit-hooks.git
@@ -144,7 +144,7 @@ repos:
144144
- id: tox-ini-fmt
145145

146146
- repo: https://github.com/astral-sh/ruff-pre-commit
147-
rev: v0.11.4
147+
rev: v0.11.7
148148
hooks:
149149
- id: ruff
150150
args:
@@ -180,7 +180,7 @@ repos:
180180
- wcmatch
181181
- yamllint>=1.34.0
182182
- repo: https://github.com/RobertCraigie/pyright-python
183-
rev: v1.1.398
183+
rev: v1.1.400
184184
hooks:
185185
- id: pyright
186186
additional_dependencies: *deps

src/ansiblelint/requirements.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ class Reqs(dict[str, SpecifierSet]):
1313

1414
def __init__(self, name: str = "ansible-lint") -> None:
1515
"""Load linter metadata requirements."""
16-
for req_str in importlib_metadata.metadata(name).json["requires_dist"]:
17-
req = Requirement(req_str)
18-
if req.name:
19-
self[req.name] = req.specifier
16+
metadata = importlib_metadata.metadata(name)
17+
if metadata:
18+
for req_str in metadata.json["requires_dist"]:
19+
req = Requirement(req_str)
20+
if req.name:
21+
self[req.name] = req.specifier
2022

2123
def matches(self, req_name: str, req_version: str | Version) -> bool:
2224
"""Verify if given version is matching current metadata dependencies."""

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ deps =
116116
twine>=4.0.1
117117
commands_pre =
118118
commands =
119-
bash -c "PIPX_BIN_DIR={work_dir}/.pipx/bin PIPX_HOME={work_dir}/.pipx pipx install --force -e ."
119+
bash -ec "PIPX_BIN_DIR={work_dir}/.pipx/bin; PIPX_HOME={work_dir}/.pipx; pipx uninstall ansible-lint || true; pipx install --force -e ."
120120
bash -c "if stderr=$({work_dir}/.pipx/bin/ansible-lint --version >/dev/null) && test -z \"$stderr\"; then echo "ok"; fi"
121121
{env_python} -c 'import os.path, shutil, sys; \
122122
dist_dir = os.path.join("{tox_root}", "dist"); \

0 commit comments

Comments
 (0)