diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ea1707ff43eb9e1d17760a4ac86bec1a886ae1d..8f0e708e9f27e292986ae619be24d7840d301c62 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,10 +2,9 @@ stages: - test - deploy -Python 3 POCL: +Pytest POCL: stage: test script: - - export PY_EXE=python3 - export PYOPENCL_TEST=portable:pthread - export EXTRA_INSTALL="pybind11 numpy mako" - export LOOPY_NO_CACHE=1 @@ -23,7 +22,6 @@ Python 3 POCL: Python 3 POCL without arg check: stage: test script: - - export PY_EXE=python3 - export PYOPENCL_TEST=portable:pthread - export EXTRA_INSTALL="pybind11 numpy mako" - export LOOPY_NO_CACHE=1 @@ -39,10 +37,9 @@ Python 3 POCL without arg check: reports: junit: test/pytest.xml -Python 3 Intel: +Pytest Intel: stage: test script: - - export PY_EXE=python3 - export PYOPENCL_TEST=intel - export EXTRA_INSTALL="pybind11 numpy mako" - export LOOPY_NO_CACHE=1 @@ -60,10 +57,9 @@ Python 3 Intel: junit: test/pytest.xml -Python 3 POCL Twice With Cache: +Pytest POCL Twice With Cache: stage: test script: | - export PY_EXE=python3 export PYOPENCL_TEST=portable:pthread export EXTRA_INSTALL="pybind11 numpy mako" curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh @@ -94,10 +90,9 @@ Python 3 POCL Twice With Cache: # except: # - tags -Python 3 POCL Examples: +Pytest POCL Examples: stage: test script: | - export PY_EXE=python3 export PYOPENCL_TEST=portable:pthread export EXTRA_INSTALL="pybind11 numpy mako pyvisfile matplotlib ipykernel nbconvert" @@ -126,7 +121,6 @@ Pylint: script: # Needed to avoid name shadowing issues when running from source directory. - PROJECT_INSTALL_FLAGS="--editable" - - export PY_EXE=python3 - EXTRA_INSTALL="pybind11 numpy mako matplotlib ipykernel ply fparser" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-pylint.sh - . ./prepare-and-run-pylint.sh "$CI_PROJECT_NAME" test/test_*.py