From 44e4b1d202f080b9a8658ec07e75109cc2871d51 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Mon, 10 Apr 2023 07:26:31 +0000 Subject: [PATCH] [PR #6308/f93a1bf5 backport][stable-6] pipx: Add support for system_site_packages (#6311) pipx: Add support for system_site_packages (#6308) * pipx: Add support for system_site_packages * Add changelog fragment (cherry picked from commit f93a1bf5eceffbdaf8a80f4b0c2c65f38e9fd7f7) Co-authored-by: Paul Aurich --- .../6308-pipx-add-system-site-packages.yml | 2 ++ plugins/module_utils/pipx.py | 1 + plugins/modules/pipx.py | 12 ++++++-- tests/integration/targets/pipx/tasks/main.yml | 28 +++++++++++++++++++ 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/6308-pipx-add-system-site-packages.yml diff --git a/changelogs/fragments/6308-pipx-add-system-site-packages.yml b/changelogs/fragments/6308-pipx-add-system-site-packages.yml new file mode 100644 index 0000000000..7660ec5f1a --- /dev/null +++ b/changelogs/fragments/6308-pipx-add-system-site-packages.yml @@ -0,0 +1,2 @@ +minor_changes: + - pipx - add ``system_site_packages`` parameter to give application access to system-wide packages (https://github.com/ansible-collections/community.general/pull/6308). diff --git a/plugins/module_utils/pipx.py b/plugins/module_utils/pipx.py index ed23645e39..2f19f352d4 100644 --- a/plugins/module_utils/pipx.py +++ b/plugins/module_utils/pipx.py @@ -39,6 +39,7 @@ def pipx_runner(module, command, **kwargs): include_injected=fmt.as_bool("--include-injected"), index_url=fmt.as_opt_val('--index-url'), python=fmt.as_opt_val('--python'), + system_site_packages=fmt.as_bool("--system-site-packages"), _list=fmt.as_fixed(['list', '--include-injected', '--json']), editable=fmt.as_bool("--editable"), pip_args=fmt.as_opt_val('--pip-args'), diff --git a/plugins/modules/pipx.py b/plugins/modules/pipx.py index 3f35696832..9c1c74470d 100644 --- a/plugins/modules/pipx.py +++ b/plugins/modules/pipx.py @@ -89,6 +89,13 @@ options: - Python version to be used when creating the application virtual environment. Must be 3.6+. - Only used when I(state=install), I(state=latest), I(state=reinstall), or I(state=reinstall_all). type: str + system_site_packages: + description: + - Give application virtual environment access to the system site-packages directory. + - Only used when I(state=install) or I(state=latest). + type: bool + default: false + version_added: 6.6.0 executable: description: - Path to the C(pipx) installed in the system. @@ -176,6 +183,7 @@ class PipX(StateModuleHelper): include_injected=dict(type='bool', default=False), index_url=dict(type='str'), python=dict(type='str'), + system_site_packages=dict(type='bool', default=False), executable=dict(type='path'), editable=dict(type='bool', default=False), pip_args=dict(type='str'), @@ -243,7 +251,7 @@ class PipX(StateModuleHelper): def state_install(self): if not self.vars.application or self.vars.force: self.changed = True - with self.runner('state index_url install_deps force python editable pip_args name_source', check_mode_skip=True) as ctx: + with self.runner('state index_url install_deps force python system_site_packages editable pip_args name_source', check_mode_skip=True) as ctx: ctx.run(name_source=[self.vars.name, self.vars.source]) self._capture_results(ctx) @@ -304,7 +312,7 @@ class PipX(StateModuleHelper): def state_latest(self): if not self.vars.application or self.vars.force: self.changed = True - with self.runner('state index_url install_deps force python editable pip_args name_source', check_mode_skip=True) as ctx: + with self.runner('state index_url install_deps force python system_site_packages editable pip_args name_source', check_mode_skip=True) as ctx: ctx.run(state='install', name_source=[self.vars.name, self.vars.source]) self._capture_results(ctx) diff --git a/tests/integration/targets/pipx/tasks/main.yml b/tests/integration/targets/pipx/tasks/main.yml index 13360af1d9..cb74d47ac2 100644 --- a/tests/integration/targets/pipx/tasks/main.yml +++ b/tests/integration/targets/pipx/tasks/main.yml @@ -51,6 +51,34 @@ - uninstall_tox is changed - "'tox' not in uninstall_tox.application" +############################################################################## +- name: install application tox with system-site-packages + community.general.pipx: + name: tox + system_site_packages: true + register: install_tox + +- name: get raw pipx_info + community.general.pipx_info: + include_raw: true + register: pipx_info_raw + +- name: uninstall application tox + community.general.pipx: + state: absent + name: tox + register: uninstall_tox + +- name: check assertions tox + assert: + that: + - install_tox is changed + - "'tox' in install_tox.application" + - pipx_info_raw is not changed + - "'--system-site-packages' in pipx_info_raw.raw_output.venvs.tox.metadata.venv_args" + - uninstall_tox is changed + - "'tox' not in uninstall_tox.application" + ############################################################################## - name: install application tox 3.24.0 community.general.pipx: