From 93535d7e45bdfb524341acd3f190212edaf34a3e Mon Sep 17 00:00:00 2001
From: u214892 <u214892@sbb.ch>
Date: Thu, 11 Jul 2019 08:57:33 +0200
Subject: [PATCH] #97 tox-conda #94 use miniconda instead of anaconda
---
.gitlab-ci.yml | 6 +++---
CONTRIBUTING.rst | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0d9efa3..d197ac7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,9 +25,9 @@ tests:
script:
- apt update
- apt install -y libgl1-mesa-glx xvfb graphviz xdg-utils libcairo2-dev libjpeg-dev libgif-dev
- - wget -nv https://repo.anaconda.com/archive/Anaconda3-5.3.1-Linux-x86_64.sh -O /tmp/Anaconda3-5.3.1-Linux-x86_64.sh
- - bash /tmp/Anaconda3-5.3.1-Linux-x86_64.sh -b -p /tmp/anaconda3
- - export PATH=/tmp/anaconda3/bin:$PATH; bash getting_started/getting_started.sh
+ - 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
- pip install tox
- xvfb-run tox -v --recreate
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index dd9500ff..aef3f026 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -77,7 +77,7 @@ Ready to contribute? Here's how to set up `flatland` for local development.
$ getting_started/getting_started.bat/.sh
- from Anaconda prompt. Only prerequisites: git and Anaconda.
+ from Anaconda prompt. Only prerequisites: git and Miniconda-3 or Anaconda-3.
4. Create a branch for local development::
--
GitLab