From 890d5bd09b90213ddcfe79e4c377f28114f3bfb8 Mon Sep 17 00:00:00 2001
From: u214892 <u214892@sbb.ch>
Date: Thu, 11 Jul 2019 12:00:54 +0200
Subject: [PATCH] #97 tox-conda #94 use miniconda instead of anaconda
---
.gitlab-ci.yml | 2 +-
CONTRIBUTING.rst | 2 ++
tox.ini | 4 +++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa5a5fc5..4033f393 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,7 @@ build_and_deploy_docs:
- tests
before_script:
- apt update
- - apt install -y libgl1-mesa-glx xvfb graphviz xdg-utils libcairo2-dev libjpeg-dev libgif-dev
+ - apt install -y graphviz 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; bash getting_started/getting_started.sh
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 66fb76e8..d015f7a6 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -70,6 +70,8 @@ Ready to contribute? Here's how to set up `flatland` for local development.
$ conda install tox
$ tox -v --recreate
+ This will create a virtual env you can then use.
+
These steps are performed if you run
$ getting_started/getting_started.bat/.sh
diff --git a/tox.ini b/tox.ini
index 80da9ccd..89ee0f46 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,6 +36,7 @@ conda_channels :
deps =
-r{toxinidir}/requirements_dev.txt
-r{toxinidir}/requirements_continuous_integration.txt
+changedir = {toxinidir}
commands =
make docs
@@ -57,6 +58,7 @@ conda_channels :
deps =
-r{toxinidir}/requirements_dev.txt
-r{toxinidir}/requirements_continuous_integration.txt
+changedir = {toxinidir}
commands =
make coverage
@@ -177,7 +179,7 @@ conda_deps =
conda_channels :
conda-forge
anaconda
-changedir = {envtmpdir}/toxinidir
+changedir = {toxinidir}
commands =
jupyter nbextension install --py --sys-prefix widgetsnbextension
jupyter nbextension enable --py --sys-prefix widgetsnbextension
--
GitLab