From 4651548004947dd0ba163ab3f9bce6064b241c15 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 16 Jun 2020 08:10:10 -0500
Subject: [PATCH] Add ensure-pip and ensure-virtualenv to build-sphinx-docs
We assume they're installed and use them, but we need to make sure
they're installed.
Change-Id: I962d8f432a8beac3acc7545f2cff6d0d99b30cbe
---
roles/ensure-sphinx/tasks/main.yaml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/roles/ensure-sphinx/tasks/main.yaml b/roles/ensure-sphinx/tasks/main.yaml
index 9add136fa..9fcc254f7 100644
--- a/roles/ensure-sphinx/tasks/main.yaml
+++ b/roles/ensure-sphinx/tasks/main.yaml
@@ -1,4 +1,10 @@
----
+- name: Install pip
+ include_role:
+ name: ensure-pip
+
+- name: Install virtualenv
+ include_role:
+ name: ensure-virtualenv
# NOTE: gettext command is provided by gettext-base package,
# so we need to check a command provided by gettext package.
@@ -38,7 +44,6 @@
- name: Gather python version variables
include_vars: "{{ sphinx_python.split('.')[0] }}.yaml"
-# TODO(dmsimard) Don't assume virtualenv is installed
- name: Install base doc building packages
pip:
name: "{{ doc_building_packages | union(doc_building_extra_packages) }}"
@@ -47,7 +52,6 @@
virtualenv_python: "{{ sphinx_python }}"
extra_args: "{{ upper_constraints | default(omit) }}"
-# TODO(dmsimard) Don't assume virtualenv is installed
- name: Install found doc requirements
pip:
requirements: "{{ requirements_file.stdout }}"