From 21bb4e3ba53346866cae27044cc81b71c74c5cf9 Mon Sep 17 00:00:00 2001 From: Nicola Musatti Date: Sun, 14 Aug 2022 09:51:20 +0200 Subject: [PATCH 1/2] Address ansible-lint issues --- .ansible-lint | 1 + defaults/main.yml | 4 ++-- meta/main.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.ansible-lint b/.ansible-lint index 07fb90d..2be80a1 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -6,3 +6,4 @@ skip_list: - risky-shell-pipe - role-name - yaml + - fqcn-builtins diff --git a/defaults/main.yml b/defaults/main.yml index 7d40eb8..bf25bb7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,8 +6,8 @@ python: "{{ ansible_python_interpreter | default( ansible_python.executable | de pip: "{{ ( ansible_python.version_info[0] == 3 ) | ternary('pip3', 'pip') }}" pip_proxy: '' -python_version: "{{ ansible_python.version_info[:3]|join('.') }}" -python_minor: "{{ ansible_python.version_info[:2]|join('.') }}" +python_version: "{{ ansible_python.version_info[:3] | join('.') }}" +python_minor: "{{ ansible_python.version_info[:2] | join('.') }}" pip_download_version: "{{ ( python_version is version_compare('3.0', '<') ) | ternary( python_minor, '3.5') }}" pip_download_url: "https://bootstrap.pypa.io/pip/{{ pip_download_version }}/get-pip.py" pip_max_version2: "{{ ( python_minor == '2.6' ) | ternary( '10', '21' ) }}" diff --git a/meta/main.yml b/meta/main.yml index 0eb48d0..037bb45 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -3,7 +3,7 @@ galaxy_info: author: bobbyrenwick description: An ansible role that ensures pip is installed at the version you specify. license: WTFPL - min_ansible_version: 1.9 + min_ansible_version: "1.9" platforms: - name: EL From 759a61bae899255d9d813338bef7271c13e8087c Mon Sep 17 00:00:00 2001 From: Nicola Musatti Date: Sun, 14 Aug 2022 09:52:42 +0200 Subject: [PATCH 2/2] Revert workflow change --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd54c08..1c7e451 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: python-version: '3.x' - name: Install test dependencies. - run: pip3 install yamllint ansible<4.10 ansible-lint<5.3.2 + run: pip3 install yamllint ansible ansible-lint - name: Lint code. run: |