UtrechtUniversity · dometto · Nov 11, 2024
diff --git a/docs/index.md b/docs/index.md
@@ -100,7 +100,6 @@ The status of a role is either Experimental or Supported. Supported roles are su
 - [miniconda](roles/miniconda.md)
 - [nginx_reverse_proxy](roles/nginx_reverse_proxy.md)
 - [nginx_uwsgi](roles/nginx_uwsgi.md)
-- [poetry](roles/poetry.md)
 - [pip](roles/pip.md)  install pip
 - [pipx_install_systemwide](roles/pipx_install_systemwide.md) install pip packages in a shared directory for all users
 - [pyenv](roles/pyenv.md)  install pyenv and use it to install custom python version

diff --git a/docs/playbooks/python-workbench.md b/docs/playbooks/python-workbench.md
@@ -16,7 +16,7 @@ Ubuntu .
 ## Description
 The Linux distribution influences which Python3 and pip3 versions are installed system-wide. Users should not install python packages using the system python interpreter, since this may break system packages. This component therefore installs `pyenv` and via the `runonce` role, so that each user on the system can manage their own Python environment. `pyenv` and `poetry` are installed (in userspace) the first time the user logs in.
 
-For additional development convenience, `poetry` and `miniconda` are also intalled on a per-user basis. If users want to use `miniconda`, they have to manually run `conda init` in their shell (this is not done by default, because it may interfere with users' workflows if they do not want to use `conda`).
+For additional development convenience, `poetry` (via [pipx](../roles/pipx_install_systemwide.md)) and `miniconda` (via [runonce](../roles/runonce.md)) are also installed. If users want to use `miniconda`, they have to manually run `conda init` in their shell (this is not done by default, because it may interfere with users' workflows if they do not want to use `conda`).
 
 ## Variables
 
@@ -26,7 +26,7 @@ For additional development convenience, `poetry` and `miniconda` are also intall
 
 - role [runonce](../roles/runonce.md)
 - role [pyenv](../roles/pyenv.md)
-- role [runonce](../roles/poetry.md)
+- role [runonce](../roles/pipx_install_systemwide.md)
 - role [miniconda](../roles/miniconda.md)
 
 ## History

diff --git a/molecule/playbook-python-workbench/verify.yml b/molecule/playbook-python-workbench/verify.yml
@@ -11,7 +11,6 @@
       register: expected_files
       with_items:
         - 01_pyenv-install.sh
-        - 10-poetry.sh
 
     - name: Assert expected files exist
       ansible.builtin.assert:
@@ -27,3 +26,6 @@
       ansible.builtin.assert:
         that:
           - '"3.8" in python_version.stdout_lines[0]'
+
+    - name: Test poetry
+      ansible.builtin.shell: su -c "bash -ic 'poetry about'" - testuser
diff --git a/playbooks/python-workbench.yml b/playbooks/python-workbench.yml
@@ -8,4 +8,7 @@
     - role: pyenv
       vars:
         pyenv_default_python: "{{ default_python_version | default('system-latest') }}"
-    - role: poetry
+    - role: pipx_install_systemwide
+      vars:
+        pipx_install_systemwide_packages:
+          - poetry
diff --git a/playbooks/roles/poetry/defaults/main.yml b/playbooks/roles/poetry/defaults/main.yml
diff --git a/playbooks/roles/poetry/files/10-poetry.sh b/playbooks/roles/poetry/files/10-poetry.sh
diff --git a/playbooks/roles/poetry/meta/main.yml b/playbooks/roles/poetry/meta/main.yml
diff --git a/playbooks/roles/poetry/molecule/default/converge.yml b/playbooks/roles/poetry/molecule/default/converge.yml
diff --git a/playbooks/roles/poetry/molecule/default/molecule.yml b/playbooks/roles/poetry/molecule/default/molecule.yml
diff --git a/playbooks/roles/poetry/molecule/default/verify.yml b/playbooks/roles/poetry/molecule/default/verify.yml
diff --git a/playbooks/roles/poetry/tasks/main.yml b/playbooks/roles/poetry/tasks/main.yml
diff --git a/playbooks/roles/poetry/tasks/system_wide.yml b/playbooks/roles/poetry/tasks/system_wide.yml