Skip to content
Snippets Groups Projects
Commit 46703bc5 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'gitlab-ci-use-maxima-from-conda' into 'master'

Gitlab CI: Use maxima installed from Conda (closes #4 on gitlab).

Closes #4

See merge request !6
parents 64f14960 fb689e6e
Loading
......@@ -16,7 +16,6 @@ Python 2.7 Conda:
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
- ". ./build-and-test-py-project-within-miniconda.sh"
tags:
- maxima
- linux
except:
- tags
......@@ -39,7 +38,6 @@ Python 3.5 Conda:
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
- ". ./build-and-test-py-project-within-miniconda.sh"
tags:
- maxima
- linux
except:
- tags
......@@ -50,7 +48,6 @@ Python 3.5 Apple:
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
- ". ./build-and-test-py-project-within-miniconda.sh"
tags:
- maxima
- apple
except:
- tags
......
......@@ -10,3 +10,4 @@ dependencies:
- conda-forge::sympy
- python=2.7
- symengine/label/dev::python-symengine=0.2.0.53.g83912b7=py27_1
- maxima
......@@ -9,3 +9,4 @@ dependencies:
- conda-forge::sympy
- python=3.5
- symengine/label/dev::python-symengine=0.2.0.53.g83912b7=py35_1
- maxima
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment