From 42653f567f62f8476b8c646f969f1277a0f95d51 Mon Sep 17 00:00:00 2001 From: Tim Sutton Date: Thu, 27 Jun 2024 13:37:44 +0100 Subject: [PATCH] Fixing doctests in gh workflow (cherry picked from commit 74600fe1d9e8b4ccee1cbf6f8b8d948b6116bfda) --- .gitignore | 6 ++++++ Makefile | 7 +++++++ doctest.dockerfile | 7 +++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0d8c5a2101e..f2f86d1e3cb 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,9 @@ venv .venv user.mk .vscode +shell.nix +vscode.sh +clean.sh +.envrc +.vscode-extensions +core diff --git a/Makefile b/Makefile index dc3bfeab2bb..d5d9566f607 100644 --- a/Makefile +++ b/Makefile @@ -126,6 +126,13 @@ tx_force_pull_translations: $(eval comma += ,) tx pull -f --parallel --mode onlytranslated -l $(subst $(space),$(comma),$(subst en$(space),,$(subst zh_,zh-,$(LANGUAGES)))) ; +doctest-gh: + # --system-site-packages needed to keep QGIS libs in python path + export PYTHONPATH=$(PYTHONPATH):/usr/lib/python3/dist-packages && \ + . /docsenv/bin/activate --system-site-packages && LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so $(SPHINXBUILD) -b doctest . $(BUILDDIR)/doctest + @echo "Testing of doctests in the sources finished, look at the " \ + "results in $(BUILDDIR)/doctest/output.txt." + doctest: LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so $(SPHINXBUILD) -b doctest . $(BUILDDIR)/doctest @echo "Testing of doctests in the sources finished, look at the " \ diff --git a/doctest.dockerfile b/doctest.dockerfile index d390319c684..b32c890b88a 100644 --- a/doctest.dockerfile +++ b/doctest.dockerfile @@ -2,8 +2,11 @@ FROM qgis/qgis:3.34 # Install requirement first to use caching COPY REQUIREMENTS.txt /documentation/REQUIREMENTS.txt -RUN pip3 install -r /documentation/REQUIREMENTS.txt + +# make the venv in /docsenv +WORKDIR / +RUN python3 -m venv docsenv && . docsenv/bin/activate && pip3 install -r /documentation/REQUIREMENTS.txt WORKDIR /documentation -CMD make doctest +CMD make doctest-gh