diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 827e9db9849787954a352fdc9fb5073eb55f334d..f090213a56a08ee81b44e4c41d9513130f5e5c99 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -368,27 +368,17 @@ - "/etc/pip_check_requirements_upgrades/pipreqcheck/requirements.txt" - "/etc/pip_check_requirements_upgrades-py3/pipreqcheck/requirements.txt" -- name: Install latest pip in pip-tools virtual environment +- name: Install requirements in the pipreqcheck virtual environment pip: - name: - - "pip>=18.0.0,<19.0.0" - virtualenv: "{{ item }}" - become: true - become_user: "pipreqcheck" - with_items: - - "~pipreqcheck/virtualenv" - - "~pipreqcheck/virtualenv-py3" - -- name: Install pip-tools if not present - pip: - name: pip-tools>=2.0.2 - state: present - virtualenv: "{{ item }}" + requirements: "{{ item.requirements }}" + virtualenv: "{{ item.virtualenv }}" become: true - become_user: "pipreqcheck" + become_user: pipreqcheck with_items: - - "~pipreqcheck/virtualenv" - - "~pipreqcheck/virtualenv-py3" + - virtualenv: "~pipreqcheck/virtualenv" + requirements: "/etc/pip_check_requirements_upgrades/pipreqcheck/requirements.txt" + - virtualenv: "~pipreqcheck/virtualenv-py3" + requirements: "/etc/pip_check_requirements_upgrades-py3/pipreqcheck/requirements.txt" - name: Synchronise pip-tools virtual environment via deployed requirements file (Python 2) shell: "source ~pipreqcheck/virtualenv/bin/activate && pip-sync /etc/pip_check_requirements_upgrades/pipreqcheck/requirements.txt"