Skip to content

Commit

Permalink
Merge branch 'main' into fix/empty/template_meta/main.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
GElkayam authored Nov 24, 2024
2 parents bf22c7f + e83eb91 commit e40d0b4
Show file tree
Hide file tree
Showing 61 changed files with 569 additions and 500 deletions.
246 changes: 121 additions & 125 deletions .config/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,127 +1,123 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --all-extras --no-annotate --output-file=.config/constraints.txt --strip-extras --unsafe-package=resolvelib --unsafe-package=ruamel-yaml-clib --unsafe-package=wcmatch pyproject.toml
#
ansible-compat==24.9.1
ansible-core==2.17.6
astroid==3.3.5
attrs==24.2.0
babel==2.16.0
beautifulsoup4==4.12.3
black==24.10.0
boolean-py==4.0
bracex==2.5.post1
cachetools==5.5.0
cairocffi==1.7.1
cairosvg==2.7.1
certifi==2024.8.30
cffi==1.17.1
chardet==5.2.0
charset-normalizer==3.4.0
click==8.1.7
colorama==0.4.6
coverage==7.6.4
coverage-enable-subprocess==1.0
cryptography==43.0.3
csscompressor==0.9.5
cssselect2==0.7.0
defusedxml==0.7.1
dill==0.3.9
distlib==0.3.9
dnspython==2.7.0
exceptiongroup==1.2.2
execnet==2.1.1
filelock==3.16.1
ghp-import==2.1.0
griffe==1.5.1
hjson==3.1.0
htmlmin2==0.1.13
idna==3.10
importlib-metadata==8.5.0
iniconfig==2.0.0
isort==5.13.2
jinja2==3.1.4
jmespath==1.0.1
jsmin==3.0.1
jsonschema==4.23.0
jsonschema-specifications==2024.10.1
license-expression==30.4.0
linkchecker==10.5.0
markdown==3.7
markdown-exec==1.9.3
markdown-include==0.8.1
markdown-it-py==3.0.0
markupsafe==3.0.2
mccabe==0.7.0
mdurl==0.1.2
mergedeep==1.3.4
mkdocs==1.6.1
mkdocs-ansible==24.3.1
mkdocs-autorefs==1.2.0
mkdocs-gen-files==0.5.0
mkdocs-get-deps==0.2.0
mkdocs-htmlproofer-plugin==1.3.0
mkdocs-macros-plugin==1.3.7
mkdocs-material==9.5.43
mkdocs-material-extensions==1.3.1
mkdocs-minify-plugin==0.8.0
mkdocs-monorepo-plugin==1.1.0
mkdocstrings==0.26.2
mkdocstrings-python==1.12.2
mypy==1.13.0
mypy-extensions==1.0.0
netaddr==1.3.0
packaging==24.1
paginate==0.5.7
pathspec==0.12.1
pillow==11.0.0
pip==24.3.1
pipdeptree==2.23.4
platformdirs==4.3.6
pluggy==1.5.0
psutil==6.1.0
pycparser==2.22
pygments==2.18.0
pylint==3.3.1
pymdown-extensions==10.12
pyproject-api==1.8.0
pytest==8.3.3
pytest-mock==3.14.0
pytest-plus==0.7.0
pytest-xdist==3.6.1
python-dateutil==2.9.0.post0
python-slugify==8.0.4
pyyaml==6.0.2
pyyaml-env-tag==0.1
referencing==0.35.1
regex==2024.9.11
requests==2.32.3
rich==13.9.4
rpds-py==0.20.1
ruamel-yaml==0.18.6
six==1.16.0
soupsieve==2.6
subprocess-tee==0.4.2
super-collections==0.5.3
termcolor==2.5.0
text-unidecode==1.3
tinycss2==1.4.0
tomli==2.0.2
tomlkit==0.13.2
tox==4.23.2
types-jsonschema==4.23.0.20240813
types-pyyaml==6.0.12.20240917
typing-extensions==4.12.2
urllib3==2.2.3
virtualenv==20.27.1
watchdog==6.0.0
webencodings==0.5.1
yamllint==1.35.1
zipp==3.20.2
# This file was autogenerated by uv via the following command:
# tox run deps
ansible-compat==24.10.0 # via ansible-lint (pyproject.toml)
astroid==3.3.5 # via pylint
attrs==24.2.0 # via jsonschema, referencing
babel==2.16.0 # via mkdocs-material
beautifulsoup4==4.12.3 # via linkchecker, mkdocs-htmlproofer-plugin
black==24.10.0 # via ansible-lint (pyproject.toml)
boolean-py==4.0 # via license-expression
bracex==2.5.post1 # via wcmatch
cachetools==5.5.0 # via tox
cairocffi==1.7.1 # via cairosvg
cairosvg==2.7.1 # via mkdocs-ansible
certifi==2024.8.30 # via requests
cffi==1.17.1 # via cairocffi, cryptography
chardet==5.2.0 # via tox
charset-normalizer==3.4.0 # via requests
click==8.1.7 # via black, mkdocs, mkdocstrings
colorama==0.4.6 # via griffe, mkdocs-material, tox
coverage==7.6.8 # via coverage-enable-subprocess, ansible-lint (pyproject.toml)
coverage-enable-subprocess==1.0 # via ansible-lint (pyproject.toml)
cryptography==43.0.3 # via ansible-core
csscompressor==0.9.5 # via mkdocs-minify-plugin
cssselect2==0.7.0 # via cairosvg
defusedxml==0.7.1 # via cairosvg
dill==0.3.9 # via pylint
distlib==0.3.9 # via virtualenv
dnspython==2.7.0 # via linkchecker
exceptiongroup==1.2.2 # via pytest
execnet==2.1.1 # via pytest-xdist
filelock==3.16.1 # via tox, virtualenv, ansible-lint (pyproject.toml)
ghp-import==2.1.0 # via mkdocs
griffe==1.5.1 # via mkdocstrings-python
hjson==3.1.0 # via mkdocs-macros-plugin, super-collections
htmlmin2==0.1.13 # via mkdocs-minify-plugin
idna==3.10 # via requests
importlib-metadata==8.5.0 # via ansible-lint (pyproject.toml)
iniconfig==2.0.0 # via pytest
isort==5.13.2 # via pylint
jinja2==3.1.4 # via ansible-core, mkdocs, mkdocs-macros-plugin, mkdocs-material, mkdocstrings
jmespath==1.0.1 # via ansible-lint (pyproject.toml)
jsmin==3.0.1 # via mkdocs-minify-plugin
jsonschema==4.23.0 # via ansible-compat, ansible-lint (pyproject.toml)
jsonschema-specifications==2024.10.1 # via jsonschema
license-expression==30.4.0 # via ansible-lint (pyproject.toml)
linkchecker==10.5.0 # via mkdocs-ansible
markdown==3.7 # via markdown-include, mkdocs, mkdocs-autorefs, mkdocs-htmlproofer-plugin, mkdocs-material, mkdocstrings, pymdown-extensions
markdown-exec==1.9.3 # via mkdocs-ansible
markdown-include==0.8.1 # via mkdocs-ansible
markdown-it-py==3.0.0 # via rich
markupsafe==3.0.2 # via jinja2, mkdocs, mkdocs-autorefs, mkdocstrings
mccabe==0.7.0 # via pylint
mdurl==0.1.2 # via markdown-it-py
mergedeep==1.3.4 # via mkdocs, mkdocs-get-deps
mkdocs==1.6.1 # via mkdocs-ansible, mkdocs-autorefs, mkdocs-gen-files, mkdocs-htmlproofer-plugin, mkdocs-macros-plugin, mkdocs-material, mkdocs-minify-plugin, mkdocs-monorepo-plugin, mkdocstrings
mkdocs-ansible==24.3.1 # via ansible-lint (pyproject.toml)
mkdocs-autorefs==1.2.0 # via mkdocstrings, mkdocstrings-python
mkdocs-gen-files==0.5.0 # via mkdocs-ansible
mkdocs-get-deps==0.2.0 # via mkdocs
mkdocs-htmlproofer-plugin==1.3.0 # via mkdocs-ansible
mkdocs-macros-plugin==1.3.7 # via mkdocs-ansible
mkdocs-material==9.5.45 # via mkdocs-ansible
mkdocs-material-extensions==1.3.1 # via mkdocs-ansible, mkdocs-material
mkdocs-minify-plugin==0.8.0 # via mkdocs-ansible
mkdocs-monorepo-plugin==1.1.0 # via mkdocs-ansible
mkdocstrings==0.27.0 # via mkdocs-ansible, mkdocstrings-python
mkdocstrings-python==1.12.2 # via mkdocs-ansible
mypy==1.13.0 # via ansible-lint (pyproject.toml)
mypy-extensions==1.0.0 # via black, mypy
netaddr==1.3.0 # via ansible-lint (pyproject.toml)
packaging==24.2 # via ansible-compat, ansible-core, black, mkdocs, mkdocs-macros-plugin, pipdeptree, pyproject-api, pytest, tox, ansible-lint (pyproject.toml)
paginate==0.5.7 # via mkdocs-material
pathspec==0.12.1 # via black, mkdocs, mkdocs-macros-plugin, yamllint, ansible-lint (pyproject.toml)
pillow==11.0.0 # via cairosvg, mkdocs-ansible
pipdeptree==2.23.4 # via mkdocs-ansible, ansible-lint (pyproject.toml)
platformdirs==4.3.6 # via black, mkdocs-get-deps, mkdocstrings, pylint, tox, virtualenv
pluggy==1.5.0 # via pytest, tox
psutil==6.1.0 # via ansible-lint (pyproject.toml)
pycparser==2.22 # via cffi
pygments==2.18.0 # via mkdocs-material, rich
pylint==3.3.1 # via ansible-lint (pyproject.toml)
pymdown-extensions==10.12 # via markdown-exec, mkdocs-ansible, mkdocs-material, mkdocstrings
pyproject-api==1.8.0 # via tox
pytest==8.3.3 # via pytest-mock, pytest-plus, pytest-xdist, ansible-lint (pyproject.toml)
pytest-mock==3.14.0 # via ansible-lint (pyproject.toml)
pytest-plus==0.7.0 # via ansible-lint (pyproject.toml)
pytest-xdist==3.6.1 # via ansible-lint (pyproject.toml)
python-dateutil==2.9.0.post0 # via ghp-import, mkdocs-macros-plugin
python-slugify==8.0.4 # via mkdocs-monorepo-plugin
pyyaml==6.0.2 # via ansible-compat, ansible-core, mkdocs, mkdocs-get-deps, mkdocs-macros-plugin, pymdown-extensions, pyyaml-env-tag, yamllint, ansible-lint (pyproject.toml)
pyyaml-env-tag==0.1 # via mkdocs
referencing==0.35.1 # via jsonschema, jsonschema-specifications, types-jsonschema
regex==2024.11.6 # via mkdocs-material
requests==2.32.3 # via linkchecker, mkdocs-htmlproofer-plugin, mkdocs-material
rich==13.9.4 # via ansible-lint (pyproject.toml)
rpds-py==0.21.0 # via jsonschema, referencing
ruamel-yaml==0.18.6 # via ansible-lint (pyproject.toml)
ruamel-yaml-clib==0.2.12 # via ruamel-yaml, ansible-lint (pyproject.toml)
six==1.16.0 # via python-dateutil
soupsieve==2.6 # via beautifulsoup4
subprocess-tee==0.4.2 # via ansible-compat, ansible-lint (pyproject.toml)
super-collections==0.5.3 # via mkdocs-macros-plugin
termcolor==2.5.0 # via mkdocs-macros-plugin
text-unidecode==1.3 # via python-slugify
tinycss2==1.4.0 # via cairosvg, cssselect2
tomli==2.1.0 # via black, coverage, mypy, pylint, pyproject-api, pytest, tox
tomlkit==0.13.2 # via pylint
tox==4.23.2 # via ansible-lint (pyproject.toml)
types-jsonschema==4.23.0.20240813 # via ansible-lint (pyproject.toml)
types-pyyaml==6.0.12.20240917 # via ansible-lint (pyproject.toml)
urllib3==2.2.3 # via requests
virtualenv==20.27.1 # via tox
watchdog==6.0.0 # via mkdocs
wcmatch==10.0 # via ansible-lint (pyproject.toml)
webencodings==0.5.1 # via cssselect2, tinycss2
yamllint==1.35.1 # via ansible-lint (pyproject.toml)
zipp==3.21.0 # via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# The following packages were excluded from the output:
# ansible-core
# pip
# resolvelib
# ruamel-yaml-clib
# wcmatch
# typing-extensions
78 changes: 37 additions & 41 deletions .config/requirements-lock.txt
Original file line number Diff line number Diff line change
@@ -1,43 +1,39 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --no-annotate --output-file=.config/requirements-lock.txt --strip-extras --unsafe-package=resolvelib --unsafe-package=ruamel-yaml-clib pyproject.toml
#
ansible-compat==24.9.1
ansible-core==2.17.6
attrs==24.2.0
black==24.10.0
bracex==2.5.post1
cffi==1.17.1
click==8.1.7
cryptography==43.0.3
filelock==3.16.1
importlib-metadata==8.5.0
jinja2==3.1.4
jsonschema==4.23.0
jsonschema-specifications==2024.10.1
markdown-it-py==3.0.0
markupsafe==3.0.2
mdurl==0.1.2
mypy-extensions==1.0.0
packaging==24.1
pathspec==0.12.1
platformdirs==4.3.6
pycparser==2.22
pygments==2.18.0
pyyaml==6.0.2
referencing==0.35.1
rich==13.9.4
rpds-py==0.20.1
ruamel-yaml==0.18.6
subprocess-tee==0.4.2
tomli==2.0.2
typing-extensions==4.12.2
wcmatch==10.0 ; python_version < "3.12"
yamllint==1.35.1
zipp==3.20.2
# This file was autogenerated by uv via the following command:
# tox run deps
ansible-compat==24.10.0 # via ansible-lint (pyproject.toml)
attrs==24.2.0 # via jsonschema, referencing
black==24.10.0 # via ansible-lint (pyproject.toml)
bracex==2.5.post1 # via wcmatch
cffi==1.17.1 # via cryptography
click==8.1.7 # via black
cryptography==43.0.3 # via ansible-core
filelock==3.16.1 # via ansible-lint (pyproject.toml)
importlib-metadata==8.5.0 # via ansible-lint (pyproject.toml)
jinja2==3.1.4 # via ansible-core
jsonschema==4.23.0 # via ansible-compat, ansible-lint (pyproject.toml)
jsonschema-specifications==2024.10.1 # via jsonschema
markdown-it-py==3.0.0 # via rich
markupsafe==3.0.2 # via jinja2
mdurl==0.1.2 # via markdown-it-py
mypy-extensions==1.0.0 # via black
packaging==24.2 # via ansible-compat, ansible-core, black, ansible-lint (pyproject.toml)
pathspec==0.12.1 # via black, yamllint, ansible-lint (pyproject.toml)
platformdirs==4.3.6 # via black
pycparser==2.22 # via cffi
pygments==2.18.0 # via rich
pyyaml==6.0.2 # via ansible-compat, ansible-core, yamllint, ansible-lint (pyproject.toml)
referencing==0.35.1 # via jsonschema, jsonschema-specifications
rich==13.9.4 # via ansible-lint (pyproject.toml)
rpds-py==0.21.0 # via jsonschema, referencing
ruamel-yaml==0.18.6 # via ansible-lint (pyproject.toml)
ruamel-yaml-clib==0.2.12 # via ruamel-yaml
subprocess-tee==0.4.2 # via ansible-compat, ansible-lint (pyproject.toml)
tomli==2.1.0 # via black
wcmatch==10.0 # via ansible-lint (pyproject.toml)
yamllint==1.35.1 # via ansible-lint (pyproject.toml)
zipp==3.21.0 # via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# The following packages were excluded from the output:
# ansible-core
# resolvelib
# ruamel-yaml-clib
# typing-extensions
2 changes: 1 addition & 1 deletion .config/requirements.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Special order section for helping pip:
will-not-work-on-windows-try-from-wsl-instead; platform_system=='Windows'
ansible-core>=2.13.0 # GPLv3
ansible-compat>=24.9.1 # GPLv3
ansible-compat>=24.10.0 # GPLv3
# alphabetically sorted:
black>=24.3.0 # MIT (security)
filelock>=3.3.0 # The Unlicense
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
name: tox

on:
push: # only publishes pushes to the main branch to TestPyPI
branches: # any integration branch but not tag
push:
branches:
- "main"
pull_request:
branches:
- "main"
schedule:
- cron: "0 0 * * *"
workflow_call:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
Expand Down Expand Up @@ -254,7 +257,7 @@ jobs:
fi
- name: Upload coverage data
uses: codecov/codecov-action@v4.5.0
uses: codecov/codecov-action@v5.0.7
with:
name: ${{ matrix.name }}
# verbose: true # optional (default = false)
Expand Down
23 changes: 10 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,18 @@ examples/playbooks/vars/strings.transformed.yml
examples/playbooks/vars/transform_nested_data.yml

# other
.cache
*.tar.gz
*.tmp.*
.DS_Store
.vscode
.cache
.envrc
.idea
src/ansiblelint/_version.py
*.tar.gz
.pytest_cache
test/eco/CODENOTIFY.html
test/eco
test/schemas/node_modules
test/local-content
.envrc
# collections
# !/collections
site
.vscode/launch.json
_readthedocs
*.tmp.*
coverage.lcov
site
src/ansiblelint/_version.py
test/eco
test/local-content
test/schemas/node_modules
Loading

0 comments on commit e40d0b4

Please sign in to comment.