diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5eb1c2481a6f0658bbd5b8d443146593028f82ff..6267f4aff7cbc582045c6b1deb2d7998ace5ccfe 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,5 @@ - repo: https://github.com/pre-commit/pre-commit-hooks - sha: v0.9.1 + sha: v0.9.3 hooks: - id: check-added-large-files - id: check-json @@ -9,11 +9,11 @@ - id: flake8 - id: check-symlinks - repo: https://github.com/adarnimrod/ansible-pre-commit.git - sha: v0.6.0 + sha: v0.7.0 hooks: - id: ansible-syntax-check - repo: https://github.com/willthames/ansible-lint - sha: v3.4.13 + sha: v3.4.15 hooks: - id: ansible-lint files: tests/playbook.yml diff --git a/tests/requirements.txt b/tests/requirements.txt index 032b0dad72dde2847566f1a537e6939c4be2e2d6..1361b26d44a90352ec0160b571983c12ea0de190 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,7 +1,7 @@ -ansible==2.3.1.0 -testinfra==1.6.4 -molecule==1.25.0 -ansible-lint==3.4.13 +ansible==2.3.2.0 +testinfra==1.7.0 +molecule<2 +ansible-lint==3.4.15 python-vagrant==0.5.15 netaddr==0.7.19 passlib==1.7.1 diff --git a/tox.ini b/tox.ini index 2209e501c441b08f025b10dffdd4426594724969..7292b825a38038dffbf71ab4e70f22c1c907833c 100644 --- a/tox.ini +++ b/tox.ini @@ -15,17 +15,17 @@ commands = [testenv:pre-commit] deps = - -rtests/requirements.txt + {[testenv]deps} pre-commit -passenv = HOME VBOX* ANSIBLE_* -whitelist_externals = - sh +passenv = {[testenv]passenv} +whitelist_externals = {[testenv]whitelist_externals} commands = sh -c "ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles" molecule dependency pre-commit run --all-files [testenv:import] -envdir = {toxinidir}/.tox/molecule -deps = -rtests/requirements.txt +envdir = {[testenv]envdir} +deps = {[testenv]deps} +passenv = {[testenv]passenv} commands = ansible-galaxy import -v