From 0ba1c82feb60c93dfa0c4d5f0d10dcf851ec748a Mon Sep 17 00:00:00 2001
From: u214892 <u214892@sbb.ch>
Date: Thu, 11 Jul 2019 17:36:07 +0200
Subject: [PATCH] #97 tox-conda #94 use miniconda instead of anaconda
---
.gitlab-ci.yml | 4 +++-
tox.ini | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34ace6a..10477c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,8 @@ tests:
- conda install -c conda-forge tox-conda
script:
- xvfb-run tox -v --recreate
+# TODO: run docs and coverage seperately since they require make and graphviz
+ - xvfb-run tox -e docs,coverage -v --recreate
build_and_deploy_docs:
image: "python:latest"
@@ -43,7 +45,7 @@ build_and_deploy_docs:
- tests
before_script:
- apt update
- - apt install -y graphviz libgl1-mesa-glx xvfb graphviz xdg-utils libcairo2-dev libjpeg-dev libgif-dev
+ - apt install -y libgl1-mesa-glx xvfb graphviz xdg-utils libcairo2-dev libjpeg-dev libgif-dev
- wget -nv https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O /tmp/Miniconda3-latest-Linux-x86_64.sh
- bash /tmp/Miniconda3-latest-Linux-x86_64.sh -b -p /tmp/miniconda3
- export PATH=/tmp/miniconda3/bin:$PATH
diff --git a/tox.ini b/tox.ini
index f155a0b..2f6b138 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py36, py37, examples, notebooks, flake8, docs, coverage
+envlist = py36, py37, examples, notebooks, flake8
[travis]
python =
--
GitLab