diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml index 55318f2266a..161dabfe25b 100644 --- a/.github/workflows/sanity.yml +++ b/.github/workflows/sanity.yml @@ -8,66 +8,3 @@ jobs: uses: ansible-network/github_actions/.github/workflows/sanity.yml@main with: matrix_include: "[]" - matrix_exclude: >- - [ - { - "ansible-version": "stable-2.9" - }, - { - "ansible-version": "stable-2.12", - "python-version": "3.7" - }, - { - "ansible-version": "stable-2.12", - "python-version": "3.11" - }, - { - "ansible-version": "stable-2.13", - "python-version": "3.7" - }, - { - "ansible-version": "stable-2.13", - "python-version": "3.11" - }, - { - "ansible-version": "stable-2.14", - "python-version": "3.7" - }, - { - "ansible-version": "stable-2.14", - "python-version": "3.8" - }, - { - "ansible-version": "stable-2.15", - "python-version": "3.7" - }, - { - "ansible-version": "stable-2.15", - "python-version": "3.8" - }, - { - "ansible-version": "milestone", - "python-version": "3.7" - }, - { - "ansible-version": "milestone", - "python-version": "3.8" - }, - { - "ansible-version": "milestone", - "python-version": "3.9" - }, - { - "ansible-version": "devel", - "python-version": "3.7" - }, - { - "ansible-version": "devel", - "python-version": "3.8" - }, - { - "ansible-version": "devel", - "python-version": "3.9" - } - ] - collection_pre_install: '-r source/tests/sanity/requirements.yml' diff --git a/.github/workflows/units.yml b/.github/workflows/units.yml index 4c92b52f91d..7dddcc61050 100644 --- a/.github/workflows/units.yml +++ b/.github/workflows/units.yml @@ -7,66 +7,4 @@ jobs: unit-source: uses: ansible-network/github_actions/.github/workflows/unit_source.yml@main with: - matrix_exclude: >- - [ - { - "python-version": "3.11" - }, - { - "ansible-version": "stable-2.12", - "python-version": "3.7" - }, - { - "ansible-version": "stable-2.13", - "python-version": "3.7" - }, - { - "ansible-version": "stable-2.12", - "python-version": "3.8" - }, - { - "ansible-version": "stable-2.13", - "python-version": "3.8" - }, - { - "ansible-version": "stable-2.14", - "python-version": "3.7" - }, - { - "ansible-version": "stable-2.14", - "python-version": "3.8" - }, - { - "ansible-version": "stable-2.15", - "python-version": "3.7" - }, - { - "ansible-version": "stable-2.15", - "python-version": "3.8" - }, - { - "ansible-version": "milestone", - "python-version": "3.7" - }, - { - "ansible-version": "milestone", - "python-version": "3.8" - }, - { - "ansible-version": "milestone", - "python-version": "3.9" - }, - { - "ansible-version": "devel", - "python-version": "3.7" - }, - { - "ansible-version": "devel", - "python-version": "3.8" - }, - { - "ansible-version": "devel", - "python-version": "3.9" - } - ] collection_pre_install: '-r source/tests/unit/requirements.yml' diff --git a/test-requirements.txt b/test-requirements.txt index 47896f74134..22b52aac231 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -18,6 +18,7 @@ netaddr # Sometimes needed where we don't have features we need in modules awscli # Used for comparing SSH Public keys to the Amazon fingerprints -pycrypto +# pycrypto is EoL using pycryptodome for now +pycryptodome # Used by ec2_win_password cryptography diff --git a/tests/integration/requirements.txt b/tests/integration/requirements.txt index 352e8b7ff0f..38cdbd8bab4 100644 --- a/tests/integration/requirements.txt +++ b/tests/integration/requirements.txt @@ -8,6 +8,7 @@ virtualenv # Sometimes needed where we don't have features we need in modules awscli # Used for comparing SSH Public keys to the Amazon fingerprints -pycrypto +# pycrypto is EoL using pycryptodome for now +pycryptodome # Used by ec2_asg_scheduled_action python-dateutil