From c2b634a6d2a3fc8c5e4df5c6b680ea3493e383f4 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 20 Feb 2025 15:29:33 -0600 Subject: [PATCH] pip -> ansible.builtin.pip --- roles/calibre-web/tasks/install.yml | 2 +- roles/jupyterhub/tasks/install.yml | 4 ++-- roles/kalite/tasks/install.yml | 4 ++-- roles/lokole/tasks/install.yml | 6 +++--- roles/munin/tasks/install.yml | 2 +- roles/mysql/tasks/install.yml | 2 +- roles/postgresql/tasks/install.yml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml index d293afe23..5f21b6394 100644 --- a/roles/calibre-web/tasks/install.yml +++ b/roles/calibre-web/tasks/install.yml @@ -134,7 +134,7 @@ fi - name: Download Calibre-Web dependencies from 'requirements.txt' into python3 virtual environment {{ calibreweb_venv_path }} - pip: + ansible.builtin.pip: requirements: "{{ calibreweb_venv_path }}/requirements.txt" virtualenv: "{{ calibreweb_venv_path }}" # /usr/local/calibre-web-py3 #virtualenv_site_packages: no diff --git a/roles/jupyterhub/tasks/install.yml b/roles/jupyterhub/tasks/install.yml index 57a503014..359f63705 100644 --- a/roles/jupyterhub/tasks/install.yml +++ b/roles/jupyterhub/tasks/install.yml @@ -44,7 +44,7 @@ state: latest - name: "pip install 3 packages into virtual environment: {{ jupyterhub_venv }} (~316 MB total, after 2 Ansible calls)" - pip: + ansible.builtin.pip: name: - pip - wheel @@ -61,7 +61,7 @@ # https://github.com/iiab/iiab/issues/3283 - name: Break up jupyterhub/jupyterlab pip installs into 2 parts (3 packages above + 4 packages here) due to mutual dependency deadlock on some OS's - pip: + ansible.builtin.pip: name: - jupyterlab - jupyterhub_firstuseauthenticator diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index 5738c7301..b1e16a680 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -29,7 +29,7 @@ when: is_debian_12 # Also covers is_raspbian_12 - name: Use pip to pin setuptools to 44 in {{ kalite_venv }} -- if Ubuntu 22.04 / Mint 21, Ubuntu 23.10, Debian 12 or RasPiOS 12 - pip: + ansible.builtin.pip: name: setuptools==44 virtualenv: "{{ kalite_venv }}" # /usr/local/kalite/venv virtualenv_site_packages: no @@ -39,7 +39,7 @@ when: is_ubuntu_2204 or is_ubuntu_2310 or is_debian_12 # Also covers is_linuxmint_21 and is_raspbian_12 - name: Use pip to install ka-lite-static to {{ kalite_venv }} -- if Ubuntu 22.04 / Mint 21, Ubuntu 23.10, Debian 12 or RasPiOS 12 - pip: + ansible.builtin.pip: name: ka-lite-static version: "{{ kalite_version }}" virtualenv: "{{ kalite_venv }}" diff --git a/roles/lokole/tasks/install.yml b/roles/lokole/tasks/install.yml index a002268fc..fa0ea3709 100644 --- a/roles/lokole/tasks/install.yml +++ b/roles/lokole/tasks/install.yml @@ -32,7 +32,7 @@ # following line to roles/lokole/defaults/main.yml: # lokole_commit: - name: "OPTIONAL: pip install opwen_email_client (Lokole, git commit {{ lokole_commit }}) from GitHub to {{ lokole_venv }}, if lokole_commit is defined" - pip: + ansible.builtin.pip: name: "git+{{ lokole_repo }}@{{ lokole_commit }}#egg=opwen_email_client" virtualenv: "{{ lokole_venv }}" virtualenv_command: python3 -m venv "{{ lokole_venv }}" @@ -43,7 +43,7 @@ # the following line to roles/lokole/defaults/main.yml: # lokole_version: - name: "OPTIONAL: pip install opwen_email_client (Lokole, version {{ lokole_version }}) from PyPI to {{ lokole_venv }}, if lokole_version is defined" - pip: + ansible.builtin.pip: name: opwen_email_client version: "{{ lokole_version }}" virtualenv: "{{ lokole_venv }}" @@ -52,7 +52,7 @@ when: lokole_version is defined - name: "DEFAULT: pip install opwen_email_client (Lokole, latest available version) from PyPI to {{ lokole_venv }}, if above vars both UNdefined" - pip: + ansible.builtin.pip: name: opwen_email_client virtualenv: "{{ lokole_venv }}" virtualenv_command: python3 -m venv "{{ lokole_venv }}" diff --git a/roles/munin/tasks/install.yml b/roles/munin/tasks/install.yml index 89fe254cf..6757e2c98 100644 --- a/roles/munin/tasks/install.yml +++ b/roles/munin/tasks/install.yml @@ -21,7 +21,7 @@ state: present - name: pip install 'passlib' into venv /usr/local/ansible -- for Ansible module 'htpasswd' in Ansible collection community.general -- used just below - pip: + ansible.builtin.pip: name: passlib virtualenv: /usr/local/ansible extra_args: "--upgrade --no-cache-dir --prefer-binary" # 2023-10-01: Lifesaver when recent wheels (e.g. piwheels.org) are inevitably not yet built! SEE #3560 diff --git a/roles/mysql/tasks/install.yml b/roles/mysql/tasks/install.yml index 1b8a04388..fe9a72433 100644 --- a/roles/mysql/tasks/install.yml +++ b/roles/mysql/tasks/install.yml @@ -14,7 +14,7 @@ state: present - name: pip install 'PyMySQL' into venv /usr/local/ansible -- for Ansible modules {mysql_db, mysql_user} in Ansible collection community.mysql -- used in roles {mediawiki, nextcloud, wordpress, matomo, pbx} - pip: + ansible.builtin.pip: name: PyMySQL virtualenv: /usr/local/ansible extra_args: "--upgrade --no-cache-dir --prefer-binary" # 2023-10-01: Lifesaver when recent wheels (e.g. piwheels.org) are inevitably not yet built! SEE #3560 diff --git a/roles/postgresql/tasks/install.yml b/roles/postgresql/tasks/install.yml index ce14600c5..924b6024f 100644 --- a/roles/postgresql/tasks/install.yml +++ b/roles/postgresql/tasks/install.yml @@ -12,7 +12,7 @@ state: present - name: pip install 'psycopg' (NEW Psycopg 3) into venv /usr/local/ansible -- for Ansible modules {postgresql_db, postgresql_user} in Ansible collection community.postgresql -- used in moodle/tasks/install.yml - pip: + ansible.builtin.pip: name: psycopg virtualenv: /usr/local/ansible extra_args: "--upgrade --no-cache-dir --prefer-binary" # 2023-10-01: Lifesaver when recent wheels (e.g. piwheels.org) are inevitably not yet built! SEE #3560