From 25fb6302e3313cd787d7776b682a8ab32c6a1998 Mon Sep 17 00:00:00 2001
From: u214892 <u214892@sbb.ch>
Date: Thu, 11 Jul 2019 12:16:17 +0200
Subject: [PATCH] #97 tox-conda #94 use miniconda instead of anaconda
---
.gitlab-ci.yml | 4 ----
tox.ini | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4033f39..52a09b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,12 +28,10 @@ tests:
- 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; bash getting_started/getting_started.sh
- pip install tox awscli
- conda install -c conda-forge tox-conda
script:
- xvfb-run tox -v --recreate
- - xvfb-run tox -e notebooks -v --recreate
build_and_deploy_docs:
image: "python:latest"
@@ -47,7 +45,6 @@ build_and_deploy_docs:
- 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
- pip install tox awscli
- conda install -c conda-forge tox-conda
script:
@@ -72,7 +69,6 @@ benchmarks_and_profiling:
- 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; bash getting_started/getting_started.sh
- pip install tox awscli
- conda install -c conda-forge tox-conda
script:
diff --git a/tox.ini b/tox.ini
index 89ee0f4..193f052 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py36, py37, examples, flake8, docs, coverage
+envlist = py36, py37, examples, notebooks, flake8, docs, coverage
[travis]
python =
--
GitLab