From 65e19ddd798a87eb1bcd8dbfd958961bda60a6bb Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Thu, 1 Jun 2017 12:50:02 -0400 Subject: [PATCH 1/3] Add Apple Conda test --- .gitlab-ci.yml | 10 ++++++++++ .test-conda-env-py3.yml | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 .test-conda-env-py3.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ee1a5cc..dddca265 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,6 +145,16 @@ Python 2.7 Apple: except: - tags +Python 3.5 Conda Apple: + script: + - CONDA_ENVIRONMENT=.test-conda-env-py3.yml + - 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: + - apple + except: + - tags + PyPy POCL: script: - export PY_EXE=pypy diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml new file mode 100644 index 00000000..b1d4173c --- /dev/null +++ b/.test-conda-env-py3.yml @@ -0,0 +1,10 @@ +name: test-conda-env-py3 +channels: +- inducer +- conda-forge +- defaults +dependencies: +- git +- conda-forge::numpy +- pocl +- osx-pocl-icd -- GitLab From 68971df32c9f1b7bc9e31ec755f060bf0ed0edcb Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Thu, 1 Jun 2017 13:03:09 -0400 Subject: [PATCH 2/3] Fix POCL OpenCL feature package name for Apple Conda test --- .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 b1d4173c..601ca64f 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -7,4 +7,4 @@ dependencies: - git - conda-forge::numpy - pocl -- osx-pocl-icd +- osx-pocl-opencl -- GitLab From 80748c9b9c0c6c0a21d4cda8da526656e3ca6d9e Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Thu, 1 Jun 2017 13:20:31 -0400 Subject: [PATCH 3/3] Apple Conda test: install mako --- .test-conda-env-py3.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml index 601ca64f..b7a4c0cd 100644 --- a/.test-conda-env-py3.yml +++ b/.test-conda-env-py3.yml @@ -8,3 +8,4 @@ dependencies: - conda-forge::numpy - pocl - osx-pocl-opencl +- mako -- GitLab