From ae65d2d219ee8d5fd9f05d59942c475af38e76aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20M=C3=A9nager?= <herve.menager@pasteur.fr>
Date: Mon, 4 May 2020 17:46:51 +0200
Subject: [PATCH] ensure python exec can be config. for gitlab CI
---
.gitlab-ci.yml | 2 +-
ippisite/docs/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34b59796..6ec6cb5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,7 +62,7 @@ test-centos7:
- coverage html
- pip3.6 install sphinx sphinx-argparse sphinxcontrib.bibtex sphinx_rtd_theme
- cd docs
- - make html
+ - PYTHON=python3.6 make html
artifacts:
paths:
- ippisite/htmlcov
diff --git a/ippisite/docs/Makefile b/ippisite/docs/Makefile
index 5fa94b06..2d45653d 100644
--- a/ippisite/docs/Makefile
+++ b/ippisite/docs/Makefile
@@ -19,5 +19,5 @@ help:
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXAPI) -o $(SOURCEDIR) $(SPHINXAPISRC)
- python ../manage.py graph_models ippidb --dot > source/db.dot
+ $(PYTHON) ../manage.py graph_models ippidb --dot > source/db.dot
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
--
GitLab