From dbfdfecbefb644c56dd65e3c69d0fdc98624bb73 Mon Sep 17 00:00:00 2001
From: u214892 <u214892@sbb.ch>
Date: Fri, 12 Jul 2019 14:22:30 +0200
Subject: [PATCH] #97 tox-conda #94 use miniconda instead of anaconda
---
.gitlab-ci.yml | 2 --
tox.ini | 6 ++++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f264f53..ce17e5f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,8 +34,6 @@ 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"
diff --git a/tox.ini b/tox.ini
index 1b2fd945..4b08482f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ commands =
flake8 flatland tests examples benchmarks
[testenv:docs]
-; TODO docs requires make and graphviz installed, therefore exclude Windows
+; TODO https://gitlab.aicrowd.com/flatland/flatland/issues/33 docs requires make installed, therefore exclude Windows
platform = linux|linux2|darwin
; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
basepython = python3.6
@@ -46,7 +46,7 @@ commands =
make docs
[testenv:coverage]
-; TODO coverage requires make, therefore exclude Windows
+; TODO https://gitlab.aicrowd.com/flatland/flatland/issues/33 coverage requires make, therefore exclude Windows
platform = linux|linux2|darwin
; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
basepython = python3.6
@@ -114,6 +114,7 @@ commands =
python benchmarks/profile_all_examples.py
[testenv:examples]
+; TODO should examples be run with py36 and py37??
; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
basepython = python3.6
setenv =
@@ -139,6 +140,7 @@ commands =
python {toxinidir}/benchmarks/run_all_examples.py
[testenv:notebooks]
+; TODO should examples be run with py36 and py37??
; use python3.6 because of incompatibility under Windows of the pycairo installed through conda for py37
basepython = python3.6
setenv =
--
GitLab