From 4222108313e4fc02156b7972121d15f07e96d269 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 08:36:27 +0100 Subject: [PATCH] Bump the dependencies group across 1 directory with 20 updates (#4124) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sorin Sbarnea --- .config/constraints.txt | 47 ++++++++++++++++++----------------- .config/requirements-lock.txt | 10 ++++---- .pre-commit-config.yaml | 10 ++++---- src/ansiblelint/cli.py | 4 +-- 4 files changed, 36 insertions(+), 35 deletions(-) diff --git a/.config/constraints.txt b/.config/constraints.txt index 57aae97de2..781f0e2144 100644 --- a/.config/constraints.txt +++ b/.config/constraints.txt @@ -5,22 +5,22 @@ # pip-compile --all-extras --no-annotate --output-file=.config/constraints.txt --strip-extras --unsafe-package=resolvelib --unsafe-package=ruamel-yaml-clib pyproject.toml # ansible-compat==4.1.11 -ansible-core==2.16.5 +ansible-core==2.16.6 astroid==3.1.0 attrs==23.2.0 babel==2.14.0 beautifulsoup4==4.12.3 -black==24.4.0 +black==24.4.2 boolean-py==4.0 bracex==2.4 -cairocffi==1.6.1 +cairocffi==1.7.0 cairosvg==2.7.1 certifi==2024.2.2 cffi==1.16.0 charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -coverage==7.4.4 +coverage==7.5.0 coverage-enable-subprocess==1.0 cryptography==42.0.5 csscompressor==0.9.5 @@ -28,11 +28,11 @@ cssselect2==0.7.0 defusedxml==0.7.1 dill==0.3.8 dnspython==2.6.1 -exceptiongroup==1.2.0 +exceptiongroup==1.2.1 execnet==2.1.1 -filelock==3.13.4 +filelock==3.14.0 ghp-import==2.1.0 -griffe==0.42.1 +griffe==0.44.0 htmlmin2==0.1.13 idna==3.7 iniconfig==2.0.0 @@ -45,26 +45,27 @@ jsonschema-specifications==2023.12.1 license-expression==30.3.0 linkchecker==10.4.0 markdown==3.6 -markdown-exec==1.8.0 +markdown-exec==1.8.1 markdown-include==0.8.1 markdown-it-py==3.0.0 markupsafe==2.1.5 mccabe==0.7.0 mdurl==0.1.2 mergedeep==1.3.4 -mkdocs==1.5.3 +mkdocs==1.6.0 mkdocs-ansible==24.3.0 mkdocs-autorefs==1.0.1 mkdocs-gen-files==0.5.0 -mkdocs-htmlproofer-plugin==1.2.0 +mkdocs-get-deps==0.2.0 +mkdocs-htmlproofer-plugin==1.2.1 mkdocs-macros-plugin==1.0.5 -mkdocs-material==9.5.17 +mkdocs-material==9.5.20 mkdocs-material-extensions==1.3.1 mkdocs-minify-plugin==0.8.0 mkdocs-monorepo-plugin==1.1.0 -mkdocstrings==0.24.3 -mkdocstrings-python==1.9.2 -mypy==1.9.0 +mkdocstrings==0.25.0 +mkdocstrings-python==1.10.0 +mypy==1.10.0 mypy-extensions==1.0.0 netaddr==1.2.1 packaging==24.0 @@ -72,24 +73,24 @@ paginate==0.5.6 pathspec==0.12.1 pillow==10.3.0 pip==24.0 -pipdeptree==2.18.1 -platformdirs==4.2.0 -pluggy==1.4.0 +pipdeptree==2.19.1 +platformdirs==4.2.1 +pluggy==1.5.0 psutil==5.9.8 pycparser==2.22 pygments==2.17.2 pylint==3.1.0 -pymdown-extensions==10.7.1 -pytest==8.1.1 +pymdown-extensions==10.8.1 +pytest==8.2.0 pytest-mock==3.14.0 pytest-plus==0.7.0 -pytest-xdist==3.5.0 +pytest-xdist==3.6.1 python-dateutil==2.9.0.post0 python-slugify==8.0.4 pyyaml==6.0.1 pyyaml-env-tag==0.1 -referencing==0.34.0 -regex==2023.12.25 +referencing==0.35.0 +regex==2024.4.28 requests==2.31.0 rich==13.7.1 rpds-py==0.18.0 @@ -99,7 +100,7 @@ soupsieve==2.5 subprocess-tee==0.4.1 termcolor==2.4.0 text-unidecode==1.3 -tinycss2==1.2.1 +tinycss2==1.3.0 tomli==2.0.1 tomlkit==0.12.4 types-jsonschema==4.21.0.20240331 diff --git a/.config/requirements-lock.txt b/.config/requirements-lock.txt index 194482155f..abbb7526c3 100644 --- a/.config/requirements-lock.txt +++ b/.config/requirements-lock.txt @@ -5,14 +5,14 @@ # pip-compile --no-annotate --output-file=.config/requirements-lock.txt --strip-extras --unsafe-package=resolvelib --unsafe-package=ruamel-yaml-clib pyproject.toml # ansible-compat==4.1.11 -ansible-core==2.16.5 +ansible-core==2.16.6 attrs==23.2.0 -black==24.4.0 +black==24.4.2 bracex==2.4 cffi==1.16.0 click==8.1.7 cryptography==42.0.5 -filelock==3.13.4 +filelock==3.14.0 jinja2==3.1.3 jsonschema==4.21.1 jsonschema-specifications==2023.12.1 @@ -22,11 +22,11 @@ mdurl==0.1.2 mypy-extensions==1.0.0 packaging==24.0 pathspec==0.12.1 -platformdirs==4.2.0 +platformdirs==4.2.1 pycparser==2.22 pygments==2.17.2 pyyaml==6.0.1 -referencing==0.34.0 +referencing==0.35.0 rich==13.7.1 rpds-py==0.18.0 ruamel-yaml==0.18.6 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 95bb566abb..0844cc6bb3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -69,14 +69,14 @@ repos: - prettier-plugin-toml@2.0.1 - prettier-plugin-sort-json@3.1.0 - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v8.6.1 + rev: v8.7.0 hooks: - id: cspell # entry: codespell --relative args: [--relative, --no-progress, --no-summary] name: Spell check with cspell - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.1 + rev: 0.28.2 hooks: - id: check-github-workflows - repo: https://github.com/pre-commit/pre-commit-hooks.git @@ -136,17 +136,17 @@ repos: types: [file, yaml] entry: yamllint --strict - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.3.5" + rev: "v0.4.2" hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] - repo: https://github.com/psf/black - rev: 24.3.0 + rev: 24.4.2 hooks: - id: black language_version: python3 - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.9.0 + rev: v1.10.0 hooks: - id: mypy # empty args needed in order to match mypy cli behavior diff --git a/src/ansiblelint/cli.py b/src/ansiblelint/cli.py index 18ac8b21c2..1c21729022 100644 --- a/src/ansiblelint/cli.py +++ b/src/ansiblelint/cli.py @@ -526,8 +526,8 @@ def merge_config(file_config: dict[Any, Any], cli_config: Options) -> Options: v = getattr(cli_config, entry) or file_value setattr(cli_config, entry, v) - for entry, default in scalar_map.items(): - file_value = file_config.pop(entry, default) + for entry, default_scalar in scalar_map.items(): + file_value = file_config.pop(entry, default_scalar) v = getattr(cli_config, entry, None) or file_value setattr(cli_config, entry, v)