diff --git a/.travis/config.sh b/.travis/config.sh index 992ed07..716397b 100644 --- a/.travis/config.sh +++ b/.travis/config.sh @@ -26,5 +26,3 @@ # # - RUN_FLAKE8_DISABLED # - -export LSR_MOLECULE_DEPS='-rmolecule_requirements.txt' diff --git a/molecule_extra_requirements.txt b/molecule_extra_requirements.txt new file mode 100644 index 0000000..279202c --- /dev/null +++ b/molecule_extra_requirements.txt @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT + +# Write extra requirements for running molecule here: +jmespath diff --git a/molecule_requirements.txt b/molecule_requirements.txt deleted file mode 100644 index 95356a2..0000000 --- a/molecule_requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: MIT -jmespath -selinux diff --git a/tox.ini b/tox.ini index 480d067..dd1b355 100644 --- a/tox.ini +++ b/tox.ini @@ -172,21 +172,12 @@ commands = bash -c 'cd ..; bash .travis/fix-coverage.sh; cd -' coveralls -# LSR_MOLECULE_DEPS may contain aditional Molecule dependencies. For example, -# in `network` system role, LSR_MOLECULE_DEPS can be set as -# -# LSR_MOLECULE_DEPS='-rmolecule_requirements.txt' -# -# where `molecule_requirements.txt` contains two lines: -# -# jmespath -# selinux -# [molecule_common] deps = docker molecule - {env:LSR_MOLECULE_DEPS:} + selinux + -rmolecule_extra_requirements.txt [testenv:molecule_lint] envdir = {toxworkdir}/env-{env:TRAVIS_PYTHON_VERSION:molecule}