From 853b26944dc7b2946c03faa3f3943002788bde68 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 2 Aug 2020 12:15:48 -0500 Subject: [PATCH 1/5] Gitlab CI benchmarks: py3.6 -> py3 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1579ae8..6a7d39d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,7 +105,7 @@ Flake8: Benchmarks: script: - - sed 's/python=3/python=3.6/' .test-conda-env-py3.yml > .test-conda-env.yml + #- sed 's/python=3/python=3.6/' .test-conda-env-py3.yml > .test-conda-env.yml - CONDA_ENVIRONMENT=.test-conda-env.yml - PROJECT=sumpy - PYOPENCL_TEST=portable:pthread -- GitLab From fefc3bd33e6a75ec20a5e7f07a591f72b49d82d5 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 2 Aug 2020 12:17:17 -0500 Subject: [PATCH 2/5] Gitlab CI benchmarks: py3.6 -> py3 (actually, not just comment) --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a7d39d0..631a9f48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,7 +105,6 @@ Flake8: Benchmarks: script: - #- sed 's/python=3/python=3.6/' .test-conda-env-py3.yml > .test-conda-env.yml - CONDA_ENVIRONMENT=.test-conda-env.yml - PROJECT=sumpy - PYOPENCL_TEST=portable:pthread -- GitLab From 20c5e549f8cbac25b2ee4273e73fbcfc6a445dbe Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Sun, 2 Aug 2020 12:34:00 -0500 Subject: [PATCH 3/5] Gitlab CI benchmarks: Set correct conda env name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 631a9f48..2b81f426 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,7 +105,7 @@ Flake8: Benchmarks: script: - - CONDA_ENVIRONMENT=.test-conda-env.yml + - 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/master/build-and-benchmark-py-project.sh -- GitLab From e10435239d381e782959fd1c1272a6dd22cca150 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Sun, 2 Aug 2020 20:32:30 +0200 Subject: [PATCH 4/5] Install pip<20.2 in asv --- asv.conf.json | 1 + 1 file changed, 1 insertion(+) diff --git a/asv.conf.json b/asv.conf.json index 6d6fd675..8a46664c 100644 --- a/asv.conf.json +++ b/asv.conf.json @@ -75,6 +75,7 @@ "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": [""], + "pip" : ["<20.2"], }, // Combinations of libraries/python versions can be excluded/included -- GitLab From 14ddc2ae9f27d0a3107f16aeb5bb779a76d9f457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Sun, 2 Aug 2020 21:00:49 +0200 Subject: [PATCH 5/5] Add issue link for pip hold-back to asv.conf --- asv.conf.json | 1 + 1 file changed, 1 insertion(+) diff --git a/asv.conf.json b/asv.conf.json index 8a46664c..90133beb 100644 --- a/asv.conf.json +++ b/asv.conf.json @@ -75,6 +75,7 @@ "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"], }, -- GitLab