diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7deb4fae9ab9e7df8ec06142658d8cd6fca53356..8373a93d2b77d803ba2d7d54c8d84cfe91ebd078 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,18 @@ Python 3.5 POCL: except: - tags +Python 3.5 Conda: + script: + - export SUMPY_NO_CACHE=1 + - CONDA_ENVIRONMENT=.test-conda-env-py3.yml + - REQUIREMENTS_TXT=.test-conda-env-py3-requirements.txt + - 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: + - linux + except: + - tags + Python 2.7 POCL: script: - export PY_EXE=python2.7 diff --git a/.test-conda-env-py3-requirements.txt b/.test-conda-env-py3-requirements.txt new file mode 100644 index 0000000000000000000000000000000000000000..7cefac6831754070d40eb8427b09f70a91b498cd --- /dev/null +++ b/.test-conda-env-py3-requirements.txt @@ -0,0 +1,5 @@ +git+https://github.com/inducer/boxtree +git+https://github.com/inducer/pymbolic +git+https://github.com/inducer/loopy +git+https://github.com/inducer/sumpy +git+https://github.com/inducer/meshmode diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml new file mode 100644 index 0000000000000000000000000000000000000000..c098bd19824933d4891d473594390398f659dee2 --- /dev/null +++ b/.test-conda-env-py3.yml @@ -0,0 +1,16 @@ +name: test-conda-env-py3 +channels: +- inducer +- symengine/label/dev +- conda-forge +- defaults +dependencies: +- git +- conda-forge::numpy +- conda-forge::sympy +- pocl=0.13 +- islpy +- pyopencl +- python=3.5 +- python-symengine=0.2.0.53.g83912b7=py35_1 +# things not in here: loopy boxtree pymbolic pyfmmlib meshmode sumpy diff --git a/requirements.txt b/requirements.txt index 0c3cc71e0819605fe98f5d4bc63c44ad3fcfaff5..b8bf37d218305231a886bb54047db0d56d9d4bf3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ numpy git+git://github.com/inducer/pymbolic sympy==1.0 -git+git://github.com/inducer/modepy -git+git://github.com/pyopencl/pyopencl -git+git://github.com/inducer/islpy -git+git://github.com/inducer/loopy -git+git://github.com/inducer/boxtree -git+git://github.com/inducer/meshmode -git+git://github.com/inducer/sumpy +git+https://github.com/inducer/modepy +git+https://github.com/pyopencl/pyopencl +git+https://github.com/inducer/islpy +git+https://github.com/inducer/loopy +git+https://github.com/inducer/boxtree +git+https://github.com/inducer/meshmode +git+https://github.com/inducer/sumpy