From bc63784d708fc0863864427992b9c211e4455639 Mon Sep 17 00:00:00 2001
From: Yngve Levinsen <yngve.levinsen@ess.eu>
Date: Wed, 19 Aug 2020 14:26:04 +0200
Subject: [PATCH] fix use of conda in gitlab-ci
---
.gitlab-ci.yml | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45c826b..be7343d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,13 @@
-image: registry.esss.lu.se/ics-docker/miniconda
+#image: registry.esss.lu.se/ics-docker/miniconda
+image: continuumio/miniconda3
.pip_install_default: &pip_install_default
- - pip install numpy scipy h5py matplotlib webdavclient3
-variables:
- TWINE_REPOSITORY_URL: https://artifactory.esss.lu.se/artifactory/api/pypi/ics-pypi
+ - conda update --all
+ - conda install -c anaconda scipy
+ - conda install -c conda-forge matplotlib
+ - conda install -c conda-forge h5py
+ - pip install webdavclient3
+#variables:
+# TWINE_REPOSITORY_URL: https://artifactory.esss.lu.se/artifactory/api/pypi/ics-pypi
stages:
- test
--
GitLab