diff --git a/README.md b/README.md index fce7f8a..a67d1e0 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ The default values for the variables are set in [`defaults/main.yml`](https://gi --- # defaults file for python_pip -# By default no modules should be installed. Note: This does not work on Debian Bookworm. +# By default no modules should be installed. Note: This does not work on Debian Bookworm and Ubuntu noble. # See https://peps.python.org/pep-0668/ python_pip_modules: [] diff --git a/defaults/main.yml b/defaults/main.yml index ee64e41..58163c1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,7 @@ --- # defaults file for python_pip -# By default no modules should be installed. Note: This does not work on Debian Bookworm. +# By default no modules should be installed. Note: This does not work on Debian Bookworm and Ubuntu noble. # See https://peps.python.org/pep-0668/ python_pip_modules: [] diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 8d56d20..fd56558 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -10,8 +10,7 @@ name: docker state: present when: - - ansible_distribution_release != "noble" - - ansible_distribution_release != "bookworm" + - ansible_distribution_release not in [ "bookworm", "noble" ] - ansible_os_family != "Alpine" - name: Check if bootstrap still works. @@ -23,6 +22,5 @@ name: docker state: absent when: - - ansible_distribution_release != "noble" - - ansible_distribution_release != "bookworm" + - ansible_distribution_release not in [ "bookworm", "noble" ] - ansible_os_family != "Alpine" diff --git a/tasks/main.yml b/tasks/main.yml index 4d78f85..bc5c651 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -39,8 +39,7 @@ executable: "{{ python_pip_executable | default(omit) }}" when: - python_pip_update - - ansible_distribution_release != "bookworm" - - ansible_distribution_release != "noble" + - ansible_distribution_release not in [ "bookworm", "noble" ] - ansible_os_family != "Alpine" - name: Install requested modules