Update default ansible-test docker container. (#37644)

* Limit cryptography version for Python 2.6 tests.
* Specify pip list format to eliminate warning.
pull/37650/merge
Matt Clay 7 years ago committed by GitHub
parent b95b077993
commit f11986c82a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -48,7 +48,7 @@ for python_version in "${python_versions[@]}"; do
echo "==> Checking for requirements conflicts for ${python_version} ..." echo "==> Checking for requirements conflicts for ${python_version} ..."
after=$("pip${python_version}" list) after=$("pip${python_version}" list --format=legacy)
for requirement in "${version_requirements[@]}"; do for requirement in "${version_requirements[@]}"; do
before="${after}" before="${after}"
@ -57,7 +57,7 @@ for python_version in "${python_versions[@]}"; do
"pip${python_version}" install --disable-pip-version-check -c constraints.txt -r "${requirement}" "pip${python_version}" install --disable-pip-version-check -c constraints.txt -r "${requirement}"
set +x set +x
after=$("pip${python_version}" list) after=$("pip${python_version}" list --format=legacy)
if [ "${before}" != "${after}" ]; then if [ "${before}" != "${after}" ]; then
echo "==> Conflicts detected in requirements for python ${python_version}: ${requirement}" echo "==> Conflicts detected in requirements for python ${python_version}: ${requirement}"

@ -1,4 +1,5 @@
coverage >= 4.2, != 4.3.2 # features in 4.2+ required, avoid known bug in 4.3.2 on python 2.6 coverage >= 4.2, != 4.3.2 # features in 4.2+ required, avoid known bug in 4.3.2 on python 2.6
cryptography < 2.2 ; python_version < '2.7' # cryptography 2.2 drops support for python 2.6
pywinrm >= 0.3.0 # message encryption support pywinrm >= 0.3.0 # message encryption support
astroid == 1.5.3 ; python_version >= '3.5' # newer versions of astroid require newer versions of pylint to avoid bugs astroid == 1.5.3 ; python_version >= '3.5' # newer versions of astroid require newer versions of pylint to avoid bugs
pylint == 1.7.4 ; python_version >= '3.5' # versions before 1.7.1 hang or fail to install on python 3.x pylint == 1.7.4 ; python_version >= '3.5' # versions before 1.7.1 hang or fail to install on python 3.x

Loading…
Cancel
Save