Skip to content

Commit

Permalink
Adopt molecule config JSON schema (ansible#3668)
Browse files Browse the repository at this point in the history
We move official location for Molecule Config JSON Schema inside
molecule project itself. This will be followed by updates on
JSON Schema Store and on vscode-ansible extension, and removal
from ansible/schemas project. We already did the same with navigator
and lint project, as it makes the maintenance easier.
  • Loading branch information
ssbarnea authored Sep 24, 2022
1 parent ef88a8c commit acb9ae0
Show file tree
Hide file tree
Showing 19 changed files with 3,636 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ pip-wheel-metadata
docs/docstree
.docker
molecule/**
tools/test-schema/node_modules
20 changes: 17 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,18 @@ ci:
skip:
# https://github.com/pre-commit-ci/issues/issues/55
- pip-compile
- schema
default_language_version:
python: python3.8
repos:
- repo: local
hooks:
- id: schema
name: schema
entry: bash -c "cd tools/test-schema && npm install && npm test"
pass_filenames: false
always_run: true
language: node
- repo: https://github.com/pre-commit/mirrors-prettier
# keep it before yamllint
rev: "v3.0.0-alpha.0"
Expand All @@ -15,7 +24,8 @@ repos:
exclude: >
(?x)^(
src/molecule/cookiecutter/.*|
src/molecule/test/resources/templates/.*
src/molecule/test/resources/templates/.*|
tools/test-schema/(negative_test|test)/.*|
)$
additional_dependencies:
- prettier
Expand All @@ -28,6 +38,10 @@ repos:
rev: v2.2.1
hooks:
- id: codespell
exclude: >
(?x)^(
tools/test-schema/package-lock.json
)$
- repo: https://github.com/PyCQA/isort
rev: 5.10.1
hooks:
Expand Down Expand Up @@ -104,9 +118,9 @@ repos:
rev: 6.8.0
hooks:
- id: pip-compile
entry: pip-compile -q --strip-extras --no-annotate --output-file=requirements.txt tools/opts.txt setup.cfg --extra docs --extra test --extra yamllint
entry: pip-compile -q --strip-extras --no-annotate --output-file=requirements.txt tools/opts.txt setup.cfg --extra docs --extra test --extra lint
- id: pip-compile
name: pip-compile-upgrade
entry: pip-compile -q --strip-extras -q --upgrade --no-annotate --output-file=requirements.txt tools/opts.txt setup.cfg --extra docs --extra test --extra yamllint
entry: pip-compile -q --strip-extras -q --upgrade --no-annotate --output-file=requirements.txt tools/opts.txt setup.cfg --extra docs --extra test --extra lint
files: ^(setup\.cfg|requirements.txt|constraints\.txt)$
stages: [manual]
22 changes: 21 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# pip-compile --extra=docs --extra=test --extra=yamllint --no-annotate --output-file=requirements.txt --strip-extras setup.cfg tools/opts.txt
# pip-compile --extra=docs --extra=lint --extra=test --no-annotate --output-file=requirements.txt --strip-extras setup.cfg tools/opts.txt
#
alabaster==0.7.12
ansi2html==1.8.0
Expand All @@ -15,19 +15,24 @@ babel==2.10.3
binaryornot==0.4.4
certifi==2022.6.15
cffi==1.15.1
cfgv==3.3.1
chardet==5.0.0
charset-normalizer==2.1.1
check-jsonschema==0.18.3
click==8.1.3
click-help-colors==0.9.1
commonmark==0.9.1
cookiecutter==2.1.1
coverage==6.4.4
cryptography==37.0.4
distlib==0.3.6
distro==1.7.0
docutils==0.17.1
enrich==1.2.7
execnet==1.9.0
filelock==3.8.0
flake8==5.0.4
identify==2.5.5
idna==3.3
imagesize==1.4.1
importlib-metadata==4.12.0
Expand All @@ -37,14 +42,21 @@ jinja2==3.1.2
jinja2-time==0.2.0
jsonschema==4.16.0
markupsafe==2.1.1
mccabe==0.7.0
more-itertools==8.14.0
nodeenv==1.7.0
packaging==21.3
pathspec==0.10.1
pexpect==4.8.0
pkgutil-resolve-name==1.3.10
platformdirs==2.5.2
pluggy==1.0.0
pre-commit==2.20.0
ptyprocess==0.7.0
py==1.11.0
pycodestyle==2.9.1
pycparser==2.21
pyflakes==2.5.0
pygments==2.13.0
pyparsing==3.0.9
pyrsistent==0.18.1
Expand All @@ -64,6 +76,8 @@ pyyaml==6.0
requests==2.28.1
resolvelib==0.8.1
rich==12.5.1
ruamel-yaml==0.17.21
ruamel-yaml-clib==0.2.6
simplejson==3.17.6
six==1.16.0
snowballstemmer==2.2.0
Expand All @@ -79,7 +93,13 @@ sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
subprocess-tee==0.3.5
text-unidecode==1.3
toml==0.10.2
tomli==2.0.1
typing-extensions==4.3.0
urllib3==1.26.12
virtualenv==20.16.5
yamllint==1.28.0
zipp==3.8.1

# The following packages are considered to be unsafe in a requirements file:
# setuptools
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,9 @@ test =
pytest-xdist >= 2.1.0
pytest >= 6.1.2
lint =
check-jsonschema >= 0.18.3
flake8 >= 3.8.4
jsonschema >= 4.16.0
pre-commit >= 2.10.1
yamllint

Expand Down
Loading

0 comments on commit acb9ae0

Please sign in to comment.