From cfdd350569ca483e87617818e3f2bf123b1929cf Mon Sep 17 00:00:00 2001
From: Yngve Levinsen <yngve.levinsen@ess.eu>
Date: Wed, 19 Aug 2020 15:38:43 +0200
Subject: [PATCH] replacing more pip installs with conda
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f67b3af..65d26bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,7 +39,9 @@ verify_tag:
pages:
stage: deploy
script:
- - pip install sphinx sphinxcontrib-blockdiag blockdiag sphinxcontrib-restbuilder numpy sphinx_rtd_theme
+ - conda install -c conda-forge sphinx
+ - conda install -c conda-forge numpy
+ - pip install sphinxcontrib-blockdiag blockdiag sphinxcontrib-restbuilder sphinx_rtd_theme
- pip install git+https://github.com/crossnox/m2r
- python setup.py install
- sphinx-build -b html -d public/doctrees doc public
--
GitLab