From 276f4b21de25ea6ee5863285f21246788db0c35d Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 16 Oct 2019 09:39:48 -0700 Subject: [PATCH] [stable-2.9] Fix ansible-test sanity requirements install. This fixes ansible-test so it no longer tries to install sanity test dependencies on unsupported Python versions. (cherry picked from commit 437e9b7063c6139ba908ff87f1d21221447b10ce) Co-authored-by: Matt Clay --- .../fragments/ansible-test-sanity-constraints.yml | 2 ++ test/lib/ansible_test/_data/requirements/sanity.txt | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 changelogs/fragments/ansible-test-sanity-constraints.yml diff --git a/changelogs/fragments/ansible-test-sanity-constraints.yml b/changelogs/fragments/ansible-test-sanity-constraints.yml new file mode 100644 index 00000000000..a3720de70a2 --- /dev/null +++ b/changelogs/fragments/ansible-test-sanity-constraints.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test no longer tries to install sanity test dependencies on unsupported Python versions diff --git a/test/lib/ansible_test/_data/requirements/sanity.txt b/test/lib/ansible_test/_data/requirements/sanity.txt index b6f6595ae40..e9e19060e38 100644 --- a/test/lib/ansible_test/_data/requirements/sanity.txt +++ b/test/lib/ansible_test/_data/requirements/sanity.txt @@ -1,9 +1,9 @@ cryptography jinja2 -pycodestyle -pylint ; python_version >= '3.5' # pylint 2.0.0 and later require python 3+ +pycodestyle ; python_version >= '3.5' # only used on python 3.5+ +pylint ; python_version >= '3.5' and python_version < '3.9' # only used on python 3.5+ and does not yet support python 3.9 pyyaml -rstcheck ; python_version >= '2.7' # rstcheck requires python 2.7+ +rstcheck ; python_version >= '3.5' # only used on python 3.5+ virtualenv -voluptuous ; python_version >= '2.7' # voluptuous 0.11.0 and later require python 2.7+ -yamllint +voluptuous ; python_version >= '3.5' # only used on python 3.5+ +yamllint ; python_version >= '3.5' # only used on python 3.5+