diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc22ac51ac17efa3458d2bb9ed3dfc897f97f5a1..f39642c5a8857e129e64343d211ec8c2e84e2914 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,7 +83,7 @@ Python 3 Conda Apple: - export CONDA_ENVIRONMENT=.test-conda-env-py3-macos.yml - export PYTEST_ADDOPTS=${PYTEST_ADDOPTS:--k-slowtest} - export REQUIREMENTS_TXT=.test-conda-env-py3-requirements.txt - - export CC=gcc + - export CC=clang - set -o xtrace - 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" diff --git a/.test-conda-env-py3-macos.yml b/.test-conda-env-py3-macos.yml index 6a41e88bdae78a8656bf4aa87788d01317c72331..eea9ddd7e59168d635c08f4a0f29ed04dc19ede5 100644 --- a/.test-conda-env-py3-macos.yml +++ b/.test-conda-env-py3-macos.yml @@ -10,12 +10,13 @@ dependencies: - pocl - islpy - pyopencl -- python=3.6 +- python>=3.6 - symengine=0.3.0 - python-symengine=0.3.0 - pyfmmlib # for OpenMP support in pyfmmlib - libgfortran>=3.0.1 -- gcc +- clangdev +- openmp - cython # things not in here: loopy boxtree pymbolic meshmode sumpy diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 2ac856756e0df70b068c71d725c8999f0eaf3b03..8023391b5f8598a9c94677f2d5dcefd0c6537f5d 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -10,7 +10,7 @@ dependencies: - pocl - islpy - pyopencl -- python=3.6 +- python>=3.6 - symengine=0.3.0 - python-symengine=0.3.0 - pyfmmlib