From ca385c8a4588eb9dedade3808fed020ea1150e0e Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sun, 27 Jun 2021 15:44:37 +0200 Subject: [PATCH] [stable-1] fix CI (#2892) * Make sure ruamel.yaml.clib 0.2.2 is used for Python 2.7. * Also add to unit tests requirements. * Don't install on Python 2.6. * Another constraints file. --- tests/integration/targets/inventory_kubevirt/constraints.txt | 1 + tests/unit/requirements.txt | 1 + tests/utils/constraints.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/integration/targets/inventory_kubevirt/constraints.txt b/tests/integration/targets/inventory_kubevirt/constraints.txt index c44f44e9de..e85b017d7b 100644 --- a/tests/integration/targets/inventory_kubevirt/constraints.txt +++ b/tests/integration/targets/inventory_kubevirt/constraints.txt @@ -1 +1,2 @@ setuptools < 45 ; python_version <= '2.7' # setuptools 45 and later require python 3.5 or later +ruamel.yaml.clib <= 0.2.2 ; python_version <= '2.7' # 0.2.4 require python 3.5 or later, 0.2.3 is yanked diff --git a/tests/unit/requirements.txt b/tests/unit/requirements.txt index 4cd5fe4de7..8d2d692333 100644 --- a/tests/unit/requirements.txt +++ b/tests/unit/requirements.txt @@ -17,6 +17,7 @@ httmock # requirement for kubevirt modules openshift ; python_version >= '2.7' +ruamel.yaml.clib <= 0.2.2 ; python_version == '2.7' # 0.2.4 require python 3.5 or later, 0.2.3 is yanked # requirement for maven_artifact module lxml diff --git a/tests/utils/constraints.txt b/tests/utils/constraints.txt index c2972b5c93..aa5bed49ef 100644 --- a/tests/utils/constraints.txt +++ b/tests/utils/constraints.txt @@ -43,6 +43,7 @@ botocore >= 1.10.0, < 1.14 ; python_version < '2.7' # adds support for the follo botocore >= 1.10.0 ; python_version >= '2.7' # adds support for the following AWS services: secretsmanager, fms, and acm-pca setuptools < 45 ; python_version <= '2.7' # setuptools 45 and later require python 3.5 or later cffi >= 1.14.2, != 1.14.3 # Yanked version which older versions of pip will still install: +ruamel.yaml.clib <= 0.2.2 ; python_version <= '2.7' # 0.2.4 require python 3.5 or later, 0.2.3 is yanked # freeze pylint and its requirements for consistent test results astroid == 2.2.5