diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8d6d4ed6..e77967b3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ concurrency: group: ${{ github.head_ref }} cancel-in-progress: true -on: # yamllint disable-line rule:truthy +on: # yamllint disable-line rule:truthy pull_request: branches: [main] workflow_dispatch: diff --git a/bindep.txt b/bindep.txt index d2aad375..eec29ecd 100644 --- a/bindep.txt +++ b/bindep.txt @@ -2,11 +2,9 @@ # see https://docs.openstack.org/infra/bindep/ for additional information. gcc-c++ [doc test platform:rpm] -python3-devel [test platform:rpm] -python3 [test platform:rpm] # ansible-pylibssh gcc [compile test platform:rpm] libssh-devel [compile test platform:rpm] python3-Cython [test platform:fedora-35] -python38-Cython [compile platform:centos-8 platform:rhel-8] +python3-Cython [compile platform:centos-8 platform:rhel-8] diff --git a/changelogs/fragments/bindep_fix.yaml b/changelogs/fragments/bindep_fix.yaml new file mode 100644 index 00000000..0b7be9eb --- /dev/null +++ b/changelogs/fragments/bindep_fix.yaml @@ -0,0 +1,3 @@ +--- +trivial: + - Fix 'python3-Cython' dependency in bindep.txt. diff --git a/galaxy.yml b/galaxy.yml index 96d0a7fe..648e3611 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -13,4 +13,4 @@ issues: https://github.com/ansible-collections/cisco.asa/issues tags: [cisco, asa, networking, security] # NOTE(pabelanger): We create an empty version key to keep ansible-galaxy # happy. We dynamically inject version info based on git information. -version: 4.0.1 +version: 4.0.2-dev diff --git a/plugins/module_utils/network/asa/utils/utils.py b/plugins/module_utils/network/asa/utils/utils.py index c5399db0..89fcd4ef 100644 --- a/plugins/module_utils/network/asa/utils/utils.py +++ b/plugins/module_utils/network/asa/utils/utils.py @@ -70,7 +70,7 @@ def new_dict_to_set(input_dict, temp_list, test_set, count=0): temp_list.append(k) for each in v: if isinstance(each, dict): - if [True for i in each.values() if type(i) == list]: + if [True for i in each.values() if isinstance(i, list)]: new_dict_to_set(each, temp_list, test_set, count) else: new_dict_to_set(each, temp_list, test_set, 0) diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt new file mode 100644 index 00000000..3d2a4f58 --- /dev/null +++ b/tests/sanity/ignore-2.17.txt @@ -0,0 +1 @@ +plugins/action/asa.py action-plugin-docs # base class for deprecated network platform modules using `connection: local` diff --git a/tests/unit/mock/loader.py b/tests/unit/mock/loader.py index e707365f..195746ad 100644 --- a/tests/unit/mock/loader.py +++ b/tests/unit/mock/loader.py @@ -31,7 +31,7 @@ class DictDataLoader(DataLoader): def __init__(self, file_mapping=None): file_mapping = {} if file_mapping is None else file_mapping - assert type(file_mapping) == dict + assert isinstance(file_mapping, dict) super(DictDataLoader, self).__init__()