From ec79a05759952c7a730b6b5fc5db27d58dffe10b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Tue, 23 Jul 2019 23:41:08 +0200 Subject: [PATCH 1/6] Conda CI: Upgrade symengine to 0.4, Python to 3.7 --- .test-conda-env-py3.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index a696dc8d..1b7ee47c 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -10,7 +10,9 @@ dependencies: - pocl - islpy - pyopencl -- python=3.6 -- symengine=0.3.0 -- python-symengine=0.3.0 +- python=3.7 +- symengine=0.4.0 +- python-symengine=0.4.0 + # things not in here: loopy boxtree pymbolic pyfmmlib +# (see .test-conda-env-py3-requirements.txt) \ No newline at end of file -- GitLab From 20bff213b6a92fa5ddca03510a1f00643ea31ecd Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 24 Jul 2019 02:22:36 +0200 Subject: [PATCH 2/6] Use sympy 1.4 for python 3.7 --- asv.conf.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asv.conf.json b/asv.conf.json index 9632c4fb..6d6fd675 100644 --- a/asv.conf.json +++ b/asv.conf.json @@ -68,7 +68,7 @@ // }, "matrix": { "numpy" : [""], - "sympy" : ["1.0"], + "sympy" : ["1.4"], "pyopencl" : [""], "islpy" : [""], "pocl" : [""], -- GitLab From 43f60d6f86b2e6364281185b33dd4010ca435117 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 11 Sep 2019 06:27:29 +0200 Subject: [PATCH 3/6] Update symengine to 0.5 --- .test-conda-env-py3.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 1b7ee47c..89c055eb 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -11,8 +11,8 @@ dependencies: - islpy - pyopencl - python=3.7 -- symengine=0.4.0 -- python-symengine=0.4.0 +- symengine=0.5.0 +- python-symengine=0.5.0 # things not in here: loopy boxtree pymbolic pyfmmlib # (see .test-conda-env-py3-requirements.txt) \ No newline at end of file -- GitLab From b65a4ab5592e3365dc4f1f5eadd0f10cd23cd011 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Thu, 12 Sep 2019 07:28:05 +0200 Subject: [PATCH 4/6] Fix bad merge --- .test-conda-env-py3.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index e0434a18..0c9031a0 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -12,8 +12,8 @@ dependencies: - islpy - pyopencl - python=3 -- symengine=0.3.0 -- python-symengine=0.3.0 +- symengine=0.5.0 +- python-symengine=0.5.0 - pyfmmlib - pip -- GitLab From 7e76990df983c967a9e1ad08b0f3b574bc40cd38 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 21 Jan 2020 16:25:12 +0100 Subject: [PATCH 5/6] Check symengine 0.5.1 --- .test-conda-env-py3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 0c9031a0..609b7d95 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -13,7 +13,7 @@ dependencies: - pyopencl - python=3 - symengine=0.5.0 -- python-symengine=0.5.0 +- python-symengine=0.5.1 - pyfmmlib - pip -- GitLab From 647c95a2dd6ba35497285c527488118847042275 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Tue, 11 Feb 2020 06:02:40 +0100 Subject: [PATCH 6/6] Update to symengine-0.6.0 --- .test-conda-env-py3.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 609b7d95..63214622 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -12,8 +12,7 @@ dependencies: - islpy - pyopencl - python=3 -- symengine=0.5.0 -- python-symengine=0.5.1 +- python-symengine=0.6.0 - pyfmmlib - pip -- GitLab