From ae899752b02ee531904a293a13186a1f56c36601 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Tue, 14 Dec 2021 17:28:10 -0600 Subject: [PATCH] Putz around with benchmark Gitlab CI task to avoid failures --- .gitlab-ci.yml | 11 +++++------ asv.conf.json | 7 +++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fec1e897..7d6ce9dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -132,12 +132,11 @@ Flake8: Benchmarks: stage: test - script: - - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - - PROJECT=sumpy - - PYOPENCL_TEST=portable:pthread - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-benchmark-py-project.sh - - ". ./build-and-benchmark-py-project.sh" + script: | + PROJECT=sumpy + PYOPENCL_TEST=portable:pthread + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-benchmark-py-project.sh + . ./build-and-benchmark-py-project.sh tags: - linux - benchmark diff --git a/asv.conf.json b/asv.conf.json index 800817d6..9d214154 100644 --- a/asv.conf.json +++ b/asv.conf.json @@ -49,7 +49,7 @@ // The list of conda channel names to be searched for benchmark // dependency packages in the specified order - "conda_channels": ["conda-forge", "defaults"], + "conda_channels": ["conda-forge"], // The matrix of dependencies to test. Each key is the name of a // package (in PyPI) and the values are version numbers. An empty @@ -68,15 +68,14 @@ // }, "matrix": { "numpy" : [""], - "sympy" : ["1.4"], + "sympy" : [""], "pyopencl" : [""], "islpy" : [""], "pocl" : [""], "pip+git+https://github.com/inducer/pymbolic#egg=pymbolic": [""], "pip+git+https://gitlab.tiker.net/inducer/boxtree#egg=boxtree": [""], "pip+git+https://github.com/inducer/loopy#egg=loopy": [""], - // https://github.com/pypa/pip/issues/8667 - "pip" : ["<20.2"], + "pip" : [""], }, // Combinations of libraries/python versions can be excluded/included -- GitLab