Prepare 2.0.0 release.

ansible-collections · Sep 24, 2024 · 14f980e · 14f980e
1 parent 8530f7c
commit 14f980e
Show file tree

Hide file tree

Showing 22 changed files with 66 additions and 727 deletions.
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
@@ -26,12 +26,6 @@ jobs:
         ansible:
           # It's important that Sanity is tested against all stable-X.Y branches
           # Testing against `devel` may fail as new tests are added.
-          - stable-2.9
-          - stable-2.10
-          - stable-2.11
-          - stable-2.12
-          - stable-2.13
-          - stable-2.14
           - stable-2.15
           - stable-2.16
           - stable-2.17
@@ -85,48 +79,27 @@ jobs:
         python_version:
           - ''
         include:
-          # 2.9
-          - ansible: stable-2.9
-            docker_container: ubuntu1604
-            sops_version: 3.5.0
-          - ansible: stable-2.9
-            docker_container: ubuntu1804
-            sops_version: 3.7.1
-          # 2.10
-          - ansible: stable-2.10
-            docker_container: ubuntu1804
-            sops_version: 3.6.0
-          # 2.11
-          - ansible: stable-2.11
-            docker_container: ubuntu1804
-            sops_version: 3.7.2
-          # 2.12
-          - ansible: stable-2.12
-            docker_container: ubuntu2004
-            sops_version: 3.7.0
-          # 2.13
-          - ansible: stable-2.13
-            docker_container: ubuntu2004
-            sops_version: 3.7.3
-          # 2.14
-          - ansible: stable-2.14
-            docker_container: ubuntu2204
-            sops_version: 3.7.3
           # 2.15
+          - ansible: stable-2.15
+            docker_container: ubuntu2004
+            sops_version: 3.5.0
           - ansible: stable-2.15
             docker_container: ubuntu2204
-            sops_version: 3.7.3
+            sops_version: 3.6.0
           # 2.16
+          - ansible: stable-2.16
+            docker_container: ubuntu2004
+            sops_version: 3.7.0
           - ansible: stable-2.16
             docker_container: ubuntu2204
-            sops_version: 3.8.0
+            sops_version: 3.7.3
           # 2.17
           - ansible: stable-2.17
             docker_container: ubuntu2204
-            sops_version: 3.8.1
+            sops_version: 3.8.0
           - ansible: stable-2.17
             docker_container: fedora39
-            sops_version: 3.9.0
+            sops_version: 3.8.1
           # 2.18
           - ansible: stable-2.18
             docker_container: ubuntu2404

diff --git a/.github/workflows/ee.yml b/.github/workflows/ee.yml
@@ -61,27 +61,6 @@ jobs:
             base_image: quay.io/rockylinux/rockylinux:9
             pre_base: '"#"'
             execute_playbook: ansible-playbook -v community.sops.install_localhost
-          - name: ansible-core 2.14 @ CentOS Stream 9
-            ansible_core: https://github.com/ansible/ansible/archive/stable-2.14.tar.gz
-            ansible_runner: ansible-runner
-            base_image: quay.io/centos/centos:stream9
-            pre_base: '"#"'
-            execute_playbook: ansible-playbook -v community.sops.install_localhost
-          - name: ansible-core 2.13 @ RHEL UBI 8
-            ansible_core: https://github.com/ansible/ansible/archive/stable-2.13.tar.gz
-            ansible_runner: ansible-runner
-            other_deps: |2
-                python_interpreter:
-                  package_system: python39 python39-pip python39-wheel python39-cryptography
-            base_image: docker.io/redhat/ubi8:latest
-            pre_base: '"#"'
-            execute_playbook: ansible-playbook -v community.sops.install_localhost
-          - name: ansible-core 2.12 @ Fedora 38
-            ansible_core: https://github.com/ansible/ansible/archive/stable-2.12.tar.gz
-            ansible_runner: ansible-runner
-            base_image: registry.fedoraproject.org/fedora:38
-            pre_base: '"#"'
-            execute_playbook: ansible-playbook -v community.sops.install_localhost
     runs-on: ubuntu-latest
     steps:
       - name: Check out code

diff --git a/README.md b/README.md
@@ -45,9 +45,7 @@ For more information about communication, see the [Ansible communication guide](
 
 ## Tested with Ansible
 
-Tested with the current Ansible 2.9, ansible-base 2.10, ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, ansible-core 2.14, ansible-core 2.15, ansible-core 2.16, ansible-core 2.17, and ansible-core 2.18 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported.
-
-The vars plugin requires ansible-base 2.10 or later.
+Tested with the current ansible-core 2.15, ansible-core 2.16, ansible-core 2.17, and ansible-core 2.18 releases and the current development version of ansible-core. Ansible versions before 2.15.0 are not supported.
 
 ## External requirements
 

diff --git a/changelogs/fragments/2.0.0.yml b/changelogs/fragments/2.0.0.yml
@@ -0,0 +1,5 @@
+release_summary: Major verison that drops support for End of Life Ansible/ansible-base/ansible-core versions.
+removed_features:
+  - "The collection no longer supports Ansible 2.9, ansible-base 2.10, ansible-core 2.11, ansible-core 2.12, ansible-core 2.13, and ansible-core 2.14.
+     If you need to continue using End of Life versions of Ansible/ansible-base/ansible-core, please use community.sops 1.x.y
+     (https://github.com/ansible-collections/community.sops/pull/206)."
diff --git a/galaxy.yml b/galaxy.yml
@@ -5,7 +5,7 @@
 
 namespace: community
 name: sops
-version: 1.9.0
+version: 2.0.0
 readme: README.md
 authors:
   - Edoardo Tenani

diff --git a/meta/runtime.yml b/meta/runtime.yml
@@ -3,4 +3,4 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-requires_ansible: '>=2.9.10'
+requires_ansible: '>=2.15.0'
diff --git a/plugins/filter/_latest_version.py b/plugins/filter/_latest_version.py
@@ -45,19 +45,7 @@
     type: string
 '''
 
-from ansible.module_utils.six import raise_from
-
-try:
-    from ansible.module_utils.compat.version import LooseVersion
-except ImportError:
-    try:
-        from distutils.version import LooseVersion
-    except ImportError as exc:
-        msg = (
-            'To use this plugin or module with ansible-core 2.11, ansible-base 2.10,'
-            ' or Ansible 2.9, you need to use Python < 3.12 with distutils.version present'
-        )
-        raise_from(ImportError(msg), exc)
+from ansible.module_utils.compat.version import LooseVersion
 
 
 def pick_latest_version(version_list):