diff --git a/.circleci/config.yml b/.circleci/config.yml index ffa5e99..e9e2f1f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,8 +46,8 @@ workflows: parallelism: 3 matrix: parameters: - ansible-version: ["2.15", "2.16"] - node-python-version: ["3.6"] + ansible-version: ["2.16", "2.17"] + node-python-version: ["3.7"] - collection-testing/pre-commit-lint: name: Lint - collection-testing/antsibull-docs: diff --git a/README.md b/README.md index 8d8216b..69b1fc2 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ With this collection, you can: - A recent release of Ansible. This collection officially supports the 2 most recent Ansible releases. Older versions might still work, but are not supported -- Python 3.6 or newer on the target host +- Python 3.7 or newer on the target host - For module usage, the `proxmoxer` and `requests` python modules are required on the controller host Individual roles or modules may have additional dependencies, please check their respective documentation. diff --git a/tests/plugins/test_plugins.py b/tests/plugins/test_plugins.py index 729dcef..34d561a 100644 --- a/tests/plugins/test_plugins.py +++ b/tests/plugins/test_plugins.py @@ -1,10 +1,18 @@ # pylint: disable=redefined-outer-name def test_plugins_sanity(collection_test_env, test_versions): - collection_test_env.run([ + params = [ "ansible-test", "sanity", "--docker", "--color", "-v", "--python", test_versions.node_python_version, - "--skip-test", "metaclass-boilerplate", - "--skip-test", "future-import-boilerplate", - ]) + ] + + if int(test_versions.ansible_version.split(".")[1]) <= 16: + # these flags are only valid with ansible-test 2.16 and older, as they refer to python 2.7. + # Do not include them with newer versions of ansible-test + params.extend([ + "--skip-test", "metaclass-boilerplate", + "--skip-test", "future-import-boilerplate" + ]) + + collection_test_env.run(params) diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.17.txt similarity index 100% rename from tests/sanity/ignore-2.15.txt rename to tests/sanity/ignore-2.17.txt