From 9f34bd3d1e91d4bcc38be5fedcacf7dd9ee1f183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 29 Jun 2018 16:24:43 -0400 Subject: [PATCH] Upgrade sympy to 1.1.1 for CI, upgrade Conda-based CIs to Py3.6 --- .gitlab-ci.yml | 4 ++-- .test-conda-env-py3-macos.yml | 2 +- .test-conda-env-py3.yml | 2 +- requirements.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 750bf6f4..3220e44b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ Python 3.6 POCL Examples: except: - tags -Python 3.5 Conda: +Python 3.6 Conda: script: - export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine - CONDA_ENVIRONMENT=.test-conda-env-py3.yml @@ -67,7 +67,7 @@ Python 2.7 POCL: except: - tags -Python 3.5 Conda Apple: +Python 3.6 Conda Apple: script: - export LC_ALL=en_US.UTF-8 - export LANG=en_US.UTF-8 diff --git a/.test-conda-env-py3-macos.yml b/.test-conda-env-py3-macos.yml index 807cd696..9d36c780 100644 --- a/.test-conda-env-py3-macos.yml +++ b/.test-conda-env-py3-macos.yml @@ -9,7 +9,7 @@ dependencies: - pocl=1.0 - islpy - pyopencl -- python=3.5 +- python=3.6 - symengine=0.3.0 - python-symengine=0.3.0 - pyfmmlib diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 37c60864..8d60a1f0 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -9,7 +9,7 @@ dependencies: - pocl=1.0 - islpy - pyopencl -- python=3.5 +- python=3.6 - symengine=0.3.0 - python-symengine=0.3.0 - pyfmmlib diff --git a/requirements.txt b/requirements.txt index 8925c34e..6d1e4cce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ numpy git+git://github.com/inducer/pymbolic -sympy==1.0 +sympy==1.1.1 git+https://github.com/inducer/modepy git+https://github.com/inducer/pyopencl git+https://github.com/inducer/islpy -- GitLab