Merge pull request #9 from Oefenweb/add-install-method

Add install method (like pip)

.github/workflows/ci.yml

@@ -45,6 +45,7 @@ jobs:
       matrix:
         include:
           - distro: debian10
+            ansible-version: '>=9, <10'
           - distro: debian11
           - distro: debian12
           - distro: ubuntu1804

README.md

@@ -13,7 +13,7 @@ Set up (the latest version of) virtualenv(wrapper) in Debian-like systems.
 
 #### Variables
 
-* `virtualenv_python_version_major` [default: `2`]: Python version to install `supervisor` for.
+* `virtualenv_python_version_major` [default: `3`]: Python version to install `virtualenv` for.
 * `virtualenv_python_version` [default: `virtualenv_python_version`]: Deprecated
 
 ## Dependencies

defaults/main.yml

@@ -1,4 +1,8 @@
 # defaults file
 ---
-virtualenv_python_version_major: 2
+virtualenv_install_method: native
+# Only available for < 24.04
+# virtualenv_install_method: pip
+
+virtualenv_python_version_major: 3
 virtualenv_python_version: "{{ virtualenv_python_version_major }}"

tasks/install-native.yml

@@ -0,0 +1,10 @@
+# tasks file
+---
+- name: install | native | install dependencies
+  ansible.builtin.apt:
+    name: "{{ virtualenv_install_native_apt_dependencies }}"
+    state: "{{ apt_install_state | default('latest') }}"
+    update_cache: true
+    cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
+  tags:
+    - virtualenv-install-native-install

tasks/install-pip.yml

@@ -0,0 +1,18 @@
+# tasks file
+---
+- name: install | pip | install dependencies
+  ansible.builtin.apt:
+    name: "{{ virtualenv_install_get_pip_apt_dependencies }}"
+    state: "{{ apt_install_state | default('latest') }}"
+    update_cache: true
+    cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
+  tags:
+    - virtualenv-install-pip-dependencies
+
+- name: install | pip | install (latest)  # noqa package-latest
+  ansible.builtin.pip:
+    name: "{{ virtualenv_install_get_pip_pip_dependencies }}"
+    state: latest
+    executable: "pip{{ virtualenv_python_version_major | string }}"
+  tags:
+    - virtualenv-install-pip-install

tasks/main.yml

@@ -1,23 +1,27 @@
 # tasks file
 ---
-- name: install dependencies
-  ansible.builtin.apt:
-    name: "{{ virtualenv_dependencies }}"
-    state: "{{ apt_install_state | default('latest') }}"
-    update_cache: true
-    cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
+- name: install | native
+  ansible.builtin.import_tasks: install-native.yml
+  when: virtualenv_install_method == 'native'
   tags:
     - configuration
     - virtualenv
-    - virtualenv-install
-    - virtualenv-install-dependencies
+    - virtualenv-install-native
+
+- name: install | pip
+  ansible.builtin.import_tasks: install-pip.yml
+  when: virtualenv_install_method == 'pip'
+  tags:
+    - configuration
+    - virtualenv
+    - virtualenv-install-pip
 
-- name: install  # noqa package-latest
-  ansible.builtin.pip:
-    name: "{{ virtualenv_pip_dependencies }}"
-    state: latest
-    executable: "pip{{ virtualenv_python_version_major | string }}"
+- name: verify
+  ansible.builtin.command: >
+    virtualenv --version
+  changed_when: false
   tags:
     - configuration
     - virtualenv
     - virtualenv-install
+    - virtualenv-install-verify

tests/tasks/pre.yml

@@ -1,28 +1,31 @@
 # pre test file
 ---
-- name: pip | check
-  ansible.builtin.shell: >
-    which pip
-  register: _pip_installed
-  changed_when: false
-  check_mode: false
-  failed_when: false
-
-- name: pip | install
-  when: _pip_installed.rc != 0
+- name: pip
+  when: virtualenv_install_method == 'pip'
   block:
-    - name: dependencies | install
-      ansible.builtin.apt:
-        name:
-          - "python{{ virtualenv_python_version_major is version('3', '>=') | ternary('3', '') }}"
-          - curl
-        state: "{{ apt_install_state | default('latest') }}"
-        update_cache: true
-        cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
-
-    - name: pip | install  # noqa command-instead-of-module
+    - name: pip | check
       ansible.builtin.shell: >
-        curl -sL {{ virtualenv_get_pip_url }} | python{{ virtualenv_python_version_major | string }} -
+        which pip
+      register: _pip_installed
       changed_when: false
-      tags:
-        - skip_ansible_lint
+      check_mode: false
+      failed_when: false
+
+    - name: pip | install
+      when: _pip_installed.rc != 0
+      block:
+        - name: dependencies | install
+          ansible.builtin.apt:
+            name:
+              - "python{{ virtualenv_python_version_major is version('3', '>=') | ternary('3', '') }}"
+              - curl
+            state: "{{ apt_install_state | default('latest') }}"
+            update_cache: true
+            cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
+
+        - name: pip | install  # noqa command-instead-of-module
+          ansible.builtin.shell: >
+            curl -sL {{ virtualenv_get_pip_url }} | python{{ virtualenv_python_version_major | string }} -
+          changed_when: false
+          tags:
+            - skip_ansible_lint

tests/test.yml

@@ -1,6 +1,7 @@
 # test file
 ---
-- hosts: localhost
+- name: converge
+  hosts: localhost
   connection: local
   become: true
   pre_tasks:

tests/vagrant.yml

@@ -1,6 +1,7 @@
 # test file
 ---
-- hosts: all
+- name: converge
+  hosts: all
   remote_user: vagrant
   become: true
   pre_tasks:

tests/vars/_default.yml

@@ -1,4 +1,3 @@
 # vars file
 ---
-virtualenv_python_version_major: 3
-virtualenv_get_pip_url: 'https://bootstrap.pypa.io/pip/get-pip.py'
+virtualenv_install_method: pip

tests/vars/_noble.yml

@@ -0,0 +1,3 @@
+# vars file
+---
+virtualenv_install_method: native

vars/main.yml

@@ -1,8 +1,12 @@
 # vars file
 ---
-virtualenv_dependencies:
+virtualenv_install_native_apt_dependencies:
+  - "python{{ virtualenv_python_version_major is version('3', '>=') | ternary('3', '') }}-virtualenv"
+  - "python{{ virtualenv_python_version_major is version('3', '>=') | ternary('3', '') }}-virtualenvwrapper"
+
+virtualenv_install_get_pip_apt_dependencies:
   - "python{{ virtualenv_python_version_major is version('3', '>=') | ternary('3', '') }}"
 
-virtualenv_pip_dependencies:
+virtualenv_install_get_pip_pip_dependencies:
   - virtualenv
   - virtualenvwrapper