From 51eda3fc61691cb4c515b9973582f5329bc2f074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 23 Sep 2018 13:35:43 -0400 Subject: [PATCH 1/2] Add Pytest/JUnit/Gitlab integration, Py37 CI --- .gitlab-ci.yml | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcd3ad4a..b68dc3fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,20 @@ +Python 2.7 POCL: + script: + - export PY_EXE=python2.7 + - export PYOPENCL_TEST=portable + - export EXTRA_INSTALL="pybind11 numpy mako mpi4py" + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh + - ". ./build-and-test-py-project.sh" + tags: + - python2.7 + - pocl + - mpi + except: + - tags + artifacts: + reports: + junit: test/pytest.xml + Python 3.6 Nvidia K40: script: - export PY_EXE=python3.6 @@ -10,34 +27,43 @@ Python 3.6 Nvidia K40: - nvidia-k40 except: - tags + artifacts: + reports: + junit: test/pytest.xml -Python 2.7 POCL: +Python 3.6 POCL: script: - - export PY_EXE=python2.7 + - export PY_EXE=python3.6 - export PYOPENCL_TEST=portable - export EXTRA_INSTALL="pybind11 numpy mako mpi4py" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: - - python2.7 + - python3.6 - pocl - mpi except: - tags + artifacts: + reports: + junit: test/pytest.xml -Python 3.6 POCL: +Python 3.7 POCL: script: - - export PY_EXE=python3.6 + - export PY_EXE=python3.7 - export PYOPENCL_TEST=portable - export EXTRA_INSTALL="pybind11 numpy mako mpi4py" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh - ". ./build-and-test-py-project.sh" tags: - - python3.6 + - python3.7 - pocl - mpi except: - tags + artifacts: + reports: + junit: test/pytest.xml Documentation: script: -- GitLab From ff8b410ae3a3d85eb93770af6fde310d781471d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 23 Sep 2018 14:50:10 -0400 Subject: [PATCH 2/2] Switch requirements.txt to get test deps from gitlab.tiker.net --- requirements.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 037c1429..86f8d11b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,14 @@ numpy -git+https://github.com/inducer/gmsh_interop.git -git+https://github.com/inducer/modepy.git -git+https://github.com/inducer/pyopencl.git -git+https://github.com/inducer/islpy.git -git+https://github.com/inducer/loopy.git +git+https://gitlab.tiker.net/inducer/gmsh_interop.git +git+https://gitlab.tiker.net/inducer/modepy.git +git+https://gitlab.tiker.net/inducer/pyopencl.git +git+https://gitlab.tiker.net/inducer/islpy.git +git+https://gitlab.tiker.net/inducer/loopy.git # required by pytential, which is in turn needed for some tests -git+https://github.com/inducer/boxtree.git -git+https://github.com/inducer/sumpy.git -git+https://github.com/inducer/pytential.git +git+https://gitlab.tiker.net/inducer/boxtree.git +git+https://gitlab.tiker.net/inducer/sumpy.git +git+https://gitlab.tiker.net/inducer/pytential.git # requires pymetis for tests for partition_mesh -git+https://github.com/inducer/pymetis.git +git+https://gitlab.tiker.net/inducer/pymetis.git -- GitLab