Pin yamllint to 1.2.2 to avoid issues in 1.3.0. (#16464)
This also moves shippable test requirements to external files.
This commit is contained in:
parent
007c20a28b
commit
81a49912b0
4 changed files with 8 additions and 8 deletions
1
test/utils/shippable/code-smell-requirements.txt
Normal file
1
test/utils/shippable/code-smell-requirements.txt
Normal file
|
@ -0,0 +1 @@
|
||||||
|
yamllint==1.2.2
|
|
@ -7,7 +7,8 @@ install_deps="${INSTALL_DEPS:-}"
|
||||||
cd "${source_root}"
|
cd "${source_root}"
|
||||||
|
|
||||||
if [ "${install_deps}" != "" ]; then
|
if [ "${install_deps}" != "" ]; then
|
||||||
pip install yamllint
|
pip install -r "${source_root}/test/utils/shippable/code-smell-requirements.txt" --upgrade
|
||||||
|
pip list
|
||||||
fi
|
fi
|
||||||
|
|
||||||
yamllint .
|
yamllint .
|
||||||
|
|
4
test/utils/shippable/sanity-requirements.txt
Normal file
4
test/utils/shippable/sanity-requirements.txt
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
tox
|
||||||
|
pyyaml
|
||||||
|
jinja2
|
||||||
|
setuptools
|
|
@ -15,13 +15,7 @@ if [ "${TOXENV}" = 'py24' ]; then
|
||||||
python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce|docker_common|azure_rm_common|vca|vmware).py' lib/ansible/module_utils
|
python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce|docker_common|azure_rm_common|vca|vmware).py' lib/ansible/module_utils
|
||||||
else
|
else
|
||||||
if [ "${install_deps}" != "" ]; then
|
if [ "${install_deps}" != "" ]; then
|
||||||
pip install \
|
pip install -r "${source_root}/test/utils/shippable/sanity-requirements.txt" --upgrade
|
||||||
tox \
|
|
||||||
pyyaml \
|
|
||||||
jinja2 \
|
|
||||||
setuptools \
|
|
||||||
--upgrade
|
|
||||||
|
|
||||||
pip list
|
pip list
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue