From f8de068e32f17cd8e2bb795d54d8b85dfddc7b9c Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Sat, 8 Jan 2022 13:34:11 +0100 Subject: [PATCH] Fix 2.9 unit tests (#4002) (#4005) * Fix 2.9 unit tests. * Another try. (cherry picked from commit 26a91e811fb416eb726c9fe6a73ac7efa7e7f0b0) Co-authored-by: Felix Fontein --- tests/utils/shippable/units.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/utils/shippable/units.sh b/tests/utils/shippable/units.sh index dc58415db9..b24b08432a 100755 --- a/tests/utils/shippable/units.sh +++ b/tests/utils/shippable/units.sh @@ -22,6 +22,11 @@ esac ansible-test env --timeout "${timeout}" --color -v +if [ "$2" == "2.9" ]; then + # 1.5.0+ will not install for Python 3.6+ in the 2.9 setting (due to `enum` being installed) + echo "pynacl >= 1.4.0, < 1.5.0; python_version >= '3.6'" >> tests/unit/requirements.txt +fi + if [ "$2" == "2.10" ]; then sed -i -E 's/^redis($| .*)/redis < 4.1.0/g' tests/unit/requirements.txt sed -i -E 's/^python-gitlab($| .*)/python-gitlab < 2.10.1 ; python_version >= '\'3.6\''/g' tests/unit/requirements.txt