From 4e62b27eaef82152a5ee532f88364e7a4601891f Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 31 Aug 2022 09:44:02 -0400 Subject: [PATCH 01/10] don't think we need the sed/tee stuff --- .github/workflows/asv_check.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/asv_check.yml b/.github/workflows/asv_check.yml index db0f11f4da..bb7a234d96 100644 --- a/.github/workflows/asv_check.yml +++ b/.github/workflows/asv_check.yml @@ -27,8 +27,4 @@ jobs: run: | cd benchmarks asv machine --yes - asv run HEAD^! --quick --dry-run --show-stderr | sed "/failed$/ s/^/##[error]/" | tee benchmarks.log - if grep "failed" benchmarks.log > /dev/null ; then - exit 1 - fi - + asv run HEAD^! --quick --dry-run --show-stderr From a4f8f8de225d813ee643e7fe165f43659f9ba70e Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 31 Aug 2022 10:05:17 -0400 Subject: [PATCH 02/10] better asv workflow job name --- .github/workflows/asv_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/asv_check.yml b/.github/workflows/asv_check.yml index bb7a234d96..4ae0fb297e 100644 --- a/.github/workflows/asv_check.yml +++ b/.github/workflows/asv_check.yml @@ -4,7 +4,7 @@ name: asv on: [pull_request, push] jobs: - quick: + quick-benchmarks: runs-on: ubuntu-latest defaults: run: From 494d9ea191557bd549b2839a623eb860957907c1 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 31 Aug 2022 10:05:42 -0400 Subject: [PATCH 03/10] don't call setup.py for pvlib build --- benchmarks/asv.conf.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/benchmarks/asv.conf.json b/benchmarks/asv.conf.json index 16e66ab8a1..0bf3ca39b5 100644 --- a/benchmarks/asv.conf.json +++ b/benchmarks/asv.conf.json @@ -23,10 +23,10 @@ // // "install_command": ["in-dir={env_dir} python -mpip install {wheel_file}"], // "uninstall_command": ["return-code=any python -mpip uninstall -y {project}"], - // "build_command": [ - // "python setup.py build", - // "PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}" - // ], + "build_command": [ + "python -m build", + "PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}" + ], // List of branches to benchmark. If not provided, defaults to "master" // (for git) or "default" (for mercurial). From 1ab17943637aacc2332010c4b8c839cde11a7cc0 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 31 Aug 2022 10:10:02 -0400 Subject: [PATCH 04/10] fiddling --- .github/workflows/asv_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/asv_check.yml b/.github/workflows/asv_check.yml index 4ae0fb297e..92a8bf14f3 100644 --- a/.github/workflows/asv_check.yml +++ b/.github/workflows/asv_check.yml @@ -21,7 +21,7 @@ jobs: python-version: '3.9.7' - name: Install asv - run: pip install asv==0.4.2 + run: pip install asv==0.4.2 build - name: Run asv benchmarks run: | From 74669bbd859bbdaaeb37ef945e39d0ab2236a4f4 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 31 Aug 2022 10:17:09 -0400 Subject: [PATCH 05/10] fiddle --- .github/workflows/asv_check.yml | 2 +- benchmarks/asv.conf.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/asv_check.yml b/.github/workflows/asv_check.yml index 92a8bf14f3..4ae0fb297e 100644 --- a/.github/workflows/asv_check.yml +++ b/.github/workflows/asv_check.yml @@ -21,7 +21,7 @@ jobs: python-version: '3.9.7' - name: Install asv - run: pip install asv==0.4.2 build + run: pip install asv==0.4.2 - name: Run asv benchmarks run: | diff --git a/benchmarks/asv.conf.json b/benchmarks/asv.conf.json index 0bf3ca39b5..ed51017bc3 100644 --- a/benchmarks/asv.conf.json +++ b/benchmarks/asv.conf.json @@ -115,6 +115,7 @@ // minimum supported versions { "python": "3.7", + "build": "", "numpy": "1.16.0", "pandas": "0.25.0", "scipy": "1.2.0", @@ -126,6 +127,7 @@ // latest versions available { "python": "3.8", + "build": "", "numpy": "", "pandas": "", "scipy": "", From afea86016ea5a193cf585b35705a5a29eb81df19 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 31 Aug 2022 10:28:52 -0400 Subject: [PATCH 06/10] verbose --- .github/workflows/asv_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/asv_check.yml b/.github/workflows/asv_check.yml index 4ae0fb297e..45841786c5 100644 --- a/.github/workflows/asv_check.yml +++ b/.github/workflows/asv_check.yml @@ -27,4 +27,4 @@ jobs: run: | cd benchmarks asv machine --yes - asv run HEAD^! --quick --dry-run --show-stderr + asv run HEAD^! --quick --dry-run --show-stderr --verbose From 634d3e7de1907b2f779ff2868bd553ce44dc3635 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 31 Aug 2022 10:45:46 -0400 Subject: [PATCH 07/10] fiddle --- benchmarks/asv.conf.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/benchmarks/asv.conf.json b/benchmarks/asv.conf.json index ed51017bc3..9d7a9ad058 100644 --- a/benchmarks/asv.conf.json +++ b/benchmarks/asv.conf.json @@ -24,8 +24,8 @@ // "install_command": ["in-dir={env_dir} python -mpip install {wheel_file}"], // "uninstall_command": ["return-code=any python -mpip uninstall -y {project}"], "build_command": [ - "python -m build", - "PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}" + "python -m build -o {build_cache_dir}", + // "PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}" ], // List of branches to benchmark. If not provided, defaults to "master" From 66c0dddf4d5e77030d9c5b3a32626b51c1c952d7 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 31 Aug 2022 10:54:10 -0400 Subject: [PATCH 08/10] clean up the mess --- .github/workflows/asv_check.yml | 2 +- benchmarks/asv.conf.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/asv_check.yml b/.github/workflows/asv_check.yml index 45841786c5..4ae0fb297e 100644 --- a/.github/workflows/asv_check.yml +++ b/.github/workflows/asv_check.yml @@ -27,4 +27,4 @@ jobs: run: | cd benchmarks asv machine --yes - asv run HEAD^! --quick --dry-run --show-stderr --verbose + asv run HEAD^! --quick --dry-run --show-stderr diff --git a/benchmarks/asv.conf.json b/benchmarks/asv.conf.json index 9d7a9ad058..79b56de6d9 100644 --- a/benchmarks/asv.conf.json +++ b/benchmarks/asv.conf.json @@ -25,7 +25,6 @@ // "uninstall_command": ["return-code=any python -mpip uninstall -y {project}"], "build_command": [ "python -m build -o {build_cache_dir}", - // "PIP_NO_BUILD_ISOLATION=false python -mpip wheel --no-deps --no-index -w {build_cache_dir} {build_dir}" ], // List of branches to benchmark. If not provided, defaults to "master" From 7deb259e963a9f53a1de4cea8d404fce98ba8c45 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 31 Aug 2022 10:55:57 -0400 Subject: [PATCH 09/10] push: only trigger for master branch --- .github/workflows/asv_check.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/asv_check.yml b/.github/workflows/asv_check.yml index 4ae0fb297e..d91bbde318 100644 --- a/.github/workflows/asv_check.yml +++ b/.github/workflows/asv_check.yml @@ -1,7 +1,12 @@ name: asv # CI ASV CHECK is aimed to verify that the benchmarks execute without error. -on: [pull_request, push] +on: + push: + branches: + - master + pull_request: + jobs: quick-benchmarks: From 3df1b037b49ff332311dbf53960121d5a79a4326 Mon Sep 17 00:00:00 2001 From: Kevin Anderson Date: Wed, 31 Aug 2022 11:02:00 -0400 Subject: [PATCH 10/10] tabs vs spaces... --- benchmarks/asv.conf.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/benchmarks/asv.conf.json b/benchmarks/asv.conf.json index 79b56de6d9..afaf22daba 100644 --- a/benchmarks/asv.conf.json +++ b/benchmarks/asv.conf.json @@ -114,7 +114,7 @@ // minimum supported versions { "python": "3.7", - "build": "", + "build": "", "numpy": "1.16.0", "pandas": "0.25.0", "scipy": "1.2.0", @@ -126,7 +126,7 @@ // latest versions available { "python": "3.8", - "build": "", + "build": "", "numpy": "", "pandas": "", "scipy": "",