From 29d709c9ff7b222f4ce6d44920773fbb81460e2d Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 14 Jul 2020 17:18:06 -0500 Subject: [PATCH 1/2] Refactor twice-with-cache tests for modular ci-support --- .github/workflows/ci.yml | 10 ++++++---- .gitlab-ci.yml | 18 +++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d04811928..0c6226d79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-python@v1 with: - python-version: '3.x' + python-version: '3.x' - name: "Main Script" run: | curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh @@ -56,8 +56,10 @@ jobs: - name: "Main Script" run: | 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 - ${PY_EXE} -m pytest -rw --durations=10 --tb=native --junitxml=pytest.xml -rxs $TESTABLES + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + . ./ci-support.sh + build_py_project_in_conda_env + ( test_py_project ) + ( test_py_project ) # vim: sw=4 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48bee8638..ad7b1ab8d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,15 +36,15 @@ Python 3 Intel: Python 3 POCL Twice With Cache: - 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/master/build-and-test-py-project.sh - - ". ./build-and-test-py-project.sh" - - "cd .." - - 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" + 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/master/ci-support.sh + . ./ci-support.sh + build_py_project_in_venv + ( test_py_project ) + ( test_py_project ) tags: - python3 - pocl -- GitLab From 830187fd98e01f63eb3d56126d0f19d9535a4193 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 14 Jul 2020 17:37:26 -0500 Subject: [PATCH 2/2] Add #egg= markers to requirements.txt --- requirements.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index cd9b67cf4..2105aede0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ -git+https://github.com/inducer/pytools.git -git+https://github.com/inducer/islpy.git -git+https://github.com/inducer/cgen.git -git+https://github.com/inducer/pyopencl.git -git+https://github.com/inducer/pymbolic.git -git+https://github.com/inducer/genpy.git -git+https://github.com/inducer/codepy.git +git+https://github.com/inducer/pytools.git#egg=pytools +git+https://github.com/inducer/islpy.git#egg=islpy +git+https://github.com/inducer/cgen.git#egg=cgen +git+https://github.com/inducer/pyopencl.git#egg=pyopencl +git+https://github.com/inducer/pymbolic.git#egg=pymbolic +git+https://github.com/inducer/genpy.git#egg=genpy +git+https://github.com/inducer/codepy.git#egg=codepy git+https://github.com/inducer/f2py -- GitLab