diff --git a/roles/yoda_rulesets/tasks/main.yml b/roles/yoda_rulesets/tasks/main.yml index c0ac4f461..8e3fc1bef 100644 --- a/roles/yoda_rulesets/tasks/main.yml +++ b/roles/yoda_rulesets/tasks/main.yml @@ -105,8 +105,8 @@ become: true ansible.builtin.pip: requirements: /etc/irods/yoda-ruleset/requirements.txt - extra_args: --user - executable: "{{ yoda_rulesets_pip2_path }}" + extra_args: --user --break-system-packages + executable: "{{ yoda_rulesets_pip3_path }}" - name: Ensure pysqlcipher3 is installed @@ -114,7 +114,7 @@ become: true ansible.builtin.pip: name: pysqlcipher3==1.0.4 - executable: "{{ yoda_rulesets_pip2_path }}" + executable: "{{ yoda_rulesets_pip3_path }}" extra_args: --user when: ansible_os_family == 'RedHat' @@ -122,7 +122,7 @@ - name: Check installed version of pysqlcipher3 become_user: "{{ irods_service_account }}" become: true - ansible.builtin.shell: "{{ yoda_rulesets_pip2_path }} show pysqlcipher3 | grep Version | cut -d ' ' -f 2" + ansible.builtin.shell: "{{ yoda_rulesets_pip3_path }} show pysqlcipher3 | grep Version | cut -d ' ' -f 2" ignore_errors: true changed_when: false register: pysqlcipher3_version @@ -134,26 +134,17 @@ become: true ansible.builtin.pip: name: pysqlcipher3==1.0.4 - executable: "{{ yoda_rulesets_pip2_path }}" + executable: "{{ yoda_rulesets_pip3_path }}" state: absent when: ansible_os_family == 'Debian' and '1.0.4' in pysqlcipher3_version.stdout -- name: Ensure custom build of pysqlcipher3 is installed globally for ruleset - become_user: "{{ irods_service_account }}" - become: true - ansible.builtin.command: # noqa no-changed-when - cmd: python3 -m easy_install --user https://github.com/UtrechtUniversity/pysqlcipher3/releases/download/v1.2.1/pysqlcipher3-1.2.1-py2.7-linux-x86_64.egg - when: ansible_os_family == 'Debian' and '1.2.1' not in pysqlcipher3_version.stdout - - -- name: Ensure Python 3 jsonschema is installed - become_user: '{{ irods_service_account }}' - become: true - ansible.builtin.pip: - name: jsonschema==4.19.1 - executable: "{{ yoda_rulesets_pip3_path }}" - extra_args: --user +#- name: Ensure custom build of pysqlcipher3 is installed globally for ruleset +# become_user: "{{ irods_service_account }}" +# become: true +# ansible.builtin.command: # noqa no-changed-when +# cmd: python3 -m easy_install --user https://github.com/UtrechtUniversity/pysqlcipher3/releases/download/v1.2.1/pysqlcipher3-1.2.1-py2.7-linux-x86_64.egg +# when: ansible_os_family == 'Debian' and '1.2.1' not in pysqlcipher3_version.stdout - name: Link ruleset directory diff --git a/roles/yoda_rulesets/vars/Debian.yml b/roles/yoda_rulesets/vars/Debian.yml index 11b81d9fd..9b7fd019a 100644 --- a/roles/yoda_rulesets/vars/Debian.yml +++ b/roles/yoda_rulesets/vars/Debian.yml @@ -1,6 +1,5 @@ --- # copyright Utrecht University -yoda_rulesets_pip2_path: /usr/local/bin/pip2 yoda_rulesets_pip3_path: /usr/bin/pip3 yoda_rulesets_python3_interpreter: /usr/bin/python3 diff --git a/roles/yoda_rulesets/vars/RedHat.yml b/roles/yoda_rulesets/vars/RedHat.yml index 2ae47fbb9..ca8b68494 100644 --- a/roles/yoda_rulesets/vars/RedHat.yml +++ b/roles/yoda_rulesets/vars/RedHat.yml @@ -1,6 +1,5 @@ --- # copyright Utrecht University -yoda_rulesets_pip2_path: /usr/bin/pip yoda_rulesets_pip3_path: /usr/local/bin/pip3 yoda_rulesets_python3_interpreter: /usr/local/bin/python3