From 13b2a04d16ee7042dcb25e3877c695da7ab952e6 Mon Sep 17 00:00:00 2001
From: u214892 <u214892@sbb.ch>
Date: Fri, 12 Jul 2019 14:03:22 +0200
Subject: [PATCH] #97 tox-conda #94 use miniconda instead of anaconda
---
tox.ini | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/tox.ini b/tox.ini
index 337da5cc..1b2fd945 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,9 +22,7 @@ commands =
[testenv:docs]
; TODO docs requires make and graphviz installed, therefore exclude Windows
-platform =
- linux
- darwin
+platform = linux|linux2|darwin
; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
basepython = python3.6
whitelist_externals = make
@@ -49,9 +47,7 @@ commands =
[testenv:coverage]
; TODO coverage requires make, therefore exclude Windows
-platform =
- linux
- darwin
+platform = linux|linux2|darwin
; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
basepython = python3.6
whitelist_externals = make
@@ -143,6 +139,7 @@ commands =
python {toxinidir}/benchmarks/run_all_examples.py
[testenv:notebooks]
+; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
basepython = python3.6
setenv =
PYTHONPATH = {toxinidir}
@@ -227,10 +224,8 @@ commands =
python -m pytest --basetemp={envtmpdir} {toxinidir}
[testenv:py37]
-; exclude py37 because of incompatibility under Windows of the pycairo installed through conda for py37
-platform =
- linux
- darwin
+; exclude py37 from Windows because of incompatibility the pycairo installed through conda for py37
+platform = linux|linux2|darwin
setenv =
PYTHONPATH = {toxinidir}
passenv =
--
GitLab