From c03a8bb6b878560fffbd9192d1ccb4c22e563750 Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Tue, 18 Apr 2017 00:16:54 -0500
Subject: [PATCH 1/3] Gitlab CI: Use maxima installed from Conda (closes #4 on
 gitlab).

---
 .gitlab-ci.yml | 3 ---
 .test-py2.yml  | 1 +
 .test-py3.yml  | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec9e960..5c14a54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/.test-py2.yml b/.test-py2.yml
index f21c307..6930208 100644
--- a/.test-py2.yml
+++ b/.test-py2.yml
@@ -10,3 +10,4 @@ dependencies:
  - conda-forge::sympy
  - python=2.7
  - symengine/label/dev::python-symengine=0.2.0.53.g83912b7=py27_1
+ - maxima
diff --git a/.test-py3.yml b/.test-py3.yml
index d800328..24910d5 100644
--- a/.test-py3.yml
+++ b/.test-py3.yml
@@ -9,3 +9,4 @@ dependencies:
  - conda-forge::sympy
  - python=3.5
  - symengine/label/dev::python-symengine=0.2.0.53.g83912b7=py35_1
+ - maxima
-- 
GitLab


From ef8097f516575931cd61ce5ddaba344dc0de58dd Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Tue, 18 Apr 2017 01:06:22 -0500
Subject: [PATCH 2/3] Work around conda-build bug for ecl
 (https://github.com/conda-forge/ecl-feedstock/issues/5)

---
 .test-py2.yml | 1 +
 .test-py3.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.test-py2.yml b/.test-py2.yml
index 6930208..5f49f24 100644
--- a/.test-py2.yml
+++ b/.test-py2.yml
@@ -10,4 +10,5 @@ dependencies:
  - conda-forge::sympy
  - python=2.7
  - symengine/label/dev::python-symengine=0.2.0.53.g83912b7=py27_1
+ - ecl=16.1.3=2
  - maxima
diff --git a/.test-py3.yml b/.test-py3.yml
index 24910d5..2e5f380 100644
--- a/.test-py3.yml
+++ b/.test-py3.yml
@@ -9,4 +9,5 @@ dependencies:
  - conda-forge::sympy
  - python=3.5
  - symengine/label/dev::python-symengine=0.2.0.53.g83912b7=py35_1
+ - ecl=16.1.3=2
  - maxima
-- 
GitLab


From fb689e6e41a527af075c0ac97667d42eb8f078a3 Mon Sep 17 00:00:00 2001
From: Matt Wala <wala1@illinois.edu>
Date: Tue, 18 Apr 2017 12:51:06 -0500
Subject: [PATCH 3/3] Revert "Work around conda-build bug for ecl"

This reverts commit ef8097f516575931cd61ce5ddaba344dc0de58dd.
---
 .test-py2.yml | 1 -
 .test-py3.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.test-py2.yml b/.test-py2.yml
index 5f49f24..6930208 100644
--- a/.test-py2.yml
+++ b/.test-py2.yml
@@ -10,5 +10,4 @@ dependencies:
  - conda-forge::sympy
  - python=2.7
  - symengine/label/dev::python-symengine=0.2.0.53.g83912b7=py27_1
- - ecl=16.1.3=2
  - maxima
diff --git a/.test-py3.yml b/.test-py3.yml
index 2e5f380..24910d5 100644
--- a/.test-py3.yml
+++ b/.test-py3.yml
@@ -9,5 +9,4 @@ dependencies:
  - conda-forge::sympy
  - python=3.5
  - symengine/label/dev::python-symengine=0.2.0.53.g83912b7=py35_1
- - ecl=16.1.3=2
  - maxima
-- 
GitLab