From a366a21cb96b0590f3954d977d62a1e552a66960 Mon Sep 17 00:00:00 2001 From: Robert de Bock Date: Thu, 20 Aug 2020 08:49:46 +0200 Subject: [PATCH] Fix for molecule 3.0.7 issue 2781 and pip-docker update --- templates/molecule.yml.j2 | 1 + templates/tox.ini.j2 | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/molecule.yml.j2 b/templates/molecule.yml.j2 index a85d31e..88d99e2 100644 --- a/templates/molecule.yml.j2 +++ b/templates/molecule.yml.j2 @@ -5,6 +5,7 @@ dependency: options: role-file: requirements.yml lint: | + PATH=${PATH} yamllint molecule/default/converge.yml ansible-lint molecule/default/converge.yml driver: diff --git a/templates/tox.ini.j2 b/templates/tox.ini.j2 index bf71daa..0ce210c 100644 --- a/templates/tox.ini.j2 +++ b/templates/tox.ini.j2 @@ -17,9 +17,8 @@ deps = previous: ansible>=2.8, <2.9 current: ansible>=2.9 next: git+https://github.com/ansible/ansible.git@devel - molecule>=3, <4 - docker - ansible-lint + molecule[lint]>=3, <4 + docker>=4.2, <4.3 commands = molecule test setenv = TOX_ENVNAME={envname}