From c29aefba27b41a493081be18133ffc02a76e515c Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Tue, 19 Dec 2023 21:40:01 +0100 Subject: [PATCH] debug: import six to interpreter Signed-off-by: Martin Styk --- beaker.spec | 2 ++ documentation/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/beaker.spec b/beaker.spec index 1fb4c3276..a2265cea3 100644 --- a/beaker.spec +++ b/beaker.spec @@ -53,6 +53,8 @@ BuildRequires: python3-pytest BuildRequires: python3-devel BuildRequires: python3-docutils BuildRequires: python3-sphinx +BuildRequires: python3-pip +BuildRequires: python3-six %else BuildRequires: python-setuptools BuildRequires: python-nose >= 0.10 diff --git a/documentation/Makefile b/documentation/Makefile index 3c4aed409..3e3db6bc3 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -42,8 +42,8 @@ BKR_PATH_INJECTED = $(bkr_path_injected) # You can set these variables from the command line. SPHINXOPTS = -SPHINXBUILD := $(python_command) -c '__requires__ = [$(SPHINXREQUIRES)]; import pkg_resources; \ - import bkr; bkr.__path__ = [$(BKR_PATH_INJECTED)]; \ +SPHINXBUILD := $(python_command) -V; $(python_command) -m site; $(python_command) -m pip freeze; $(python_command) -c '__requires__ = [$(SPHINXREQUIRES)]; import pkg_resources; \ + import six; import bkr; bkr.__path__ = [$(BKR_PATH_INJECTED)]; \ exec(open("$(SPHINXBUILD)").read())' PAPER = BUILDDIR = _build