From 0d8632c56e2475f4649933128eb8c05b41f27313 Mon Sep 17 00:00:00 2001 From: targuan Date: Sat, 3 Oct 2020 13:33:20 +0000 Subject: [PATCH 1/5] Fix #184: ansible 2.10 broke the build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a938b16..1d80296 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ env: - ANSIBLE_VERSION=2.9 install: - - pip install -r requirements-dev.txt - pip install "ansible>=$ANSIBLE_VERSION.0,<$ANSIBLE_VERSION.99" + - pip install -r requirements-dev.txt - pip install -e . script: From 501218b93621b561893a6c42d33ebf8a27f44c61 Mon Sep 17 00:00:00 2001 From: targuan Date: Sat, 3 Oct 2020 13:37:38 +0000 Subject: [PATCH 2/5] Drop support for python 2.7 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d80296..b31dad6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: python python: - - 2.7 - 3.6 - 3.7 - 3.8 From 369c3ea076a4f8187c96c0061d25a0f5bfa052db Mon Sep 17 00:00:00 2001 From: targuan Date: Sat, 3 Oct 2020 13:37:56 +0000 Subject: [PATCH 3/5] Add support for ansible 2.10 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b31dad6..738d2d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ python: env: - ANSIBLE_VERSION=2.8 - ANSIBLE_VERSION=2.9 + - ANSIBLE_VERSION=2.10 install: - pip install "ansible>=$ANSIBLE_VERSION.0,<$ANSIBLE_VERSION.99" From 33eb341e0337196c1d12b4bb7823701fbcaa8249 Mon Sep 17 00:00:00 2001 From: targuan Date: Sat, 3 Oct 2020 13:51:40 +0000 Subject: [PATCH 4/5] Fix build for ansible 2.10: CONDITIONAL_BARE_VARS changed to false --- tests/napalm_get_facts/get_facts_not_implemented.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/napalm_get_facts/get_facts_not_implemented.yaml b/tests/napalm_get_facts/get_facts_not_implemented.yaml index 7c05215..d615d31 100644 --- a/tests/napalm_get_facts/get_facts_not_implemented.yaml +++ b/tests/napalm_get_facts/get_facts_not_implemented.yaml @@ -28,7 +28,7 @@ rescue: - fail: msg: Whe shouldn't be here - when: ignore_notimplemented + when: ignore_notimplemented|bool - assert: that: - ansible_failed_result.msg == "The filter route_to is not supported in napalm-mock [get_route_to()]" From b579c67392cc3ee82fa841371671d4ce3a44c068 Mon Sep 17 00:00:00 2001 From: targuan Date: Sat, 3 Oct 2020 14:15:25 +0000 Subject: [PATCH 5/5] update CHANGELOG --- CHANGELOG.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 57389f8..257de65 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,10 +2,12 @@ develop ======= - Provide diff in napalm_install_config in ``result.diff`` instead of ``result.msg``. + - Drop support of Python 2.7 + - Update tests to iuse Ansible 2.10.x. 1.1.0 ===== - - Fix issue with -u not working. + - FIX ISSUE WITH -U NOT WORKING. - Update tests to use newer Python and to use Ansible 2.8.x or 2.9.x. - Improving documentation. - Update module docstring.