From ee4f730db5d9b39f0d501c907f13fa2ff34cf884 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 13 Mar 2024 10:25:13 -0400 Subject: [PATCH] Makefile: simplify doc-setup Consistently use pip and link to the upstream bug: https://github.com/canonical/sphinx-docs-starter-pack/issues/197 Signed-off-by: Simon Deziel --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 55affd7a0599..fc599ade01e6 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,8 @@ update-metadata: build doc-setup: client @echo "Setting up documentation build environment" python3 -m venv doc/.sphinx/venv - . $(SPHINXENV) ; pip3 install gitpython pyyaml + # Workaround for https://github.com/canonical/sphinx-docs-starter-pack/issues/197 + . $(SPHINXENV) ; pip install --require-virtualenv gitpython pyyaml . $(SPHINXENV) ; cd doc && LOCAL_SPHINX_BUILD=True python3 .sphinx/build_requirements.py . $(SPHINXENV) ; pip install --require-virtualenv --upgrade -r doc/.sphinx/requirements.txt --log doc/.sphinx/venv/pip_install.log @test ! -f doc/.sphinx/venv/pip_list.txt || \