From f8fd84821ea79623f942708d4e77d62186de882f Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 1 Apr 2022 15:37:46 +0100 Subject: [PATCH 1/4] CI: Simplify call to asv --- .github/workflows/code-checks.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index 16ac3cbf47705..5592742c8d51f 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -140,22 +140,11 @@ jobs: - name: Run ASV benchmarks run: | cd asv_bench - asv check -E existing - git remote add upstream https://github.com/pandas-dev/pandas.git - git fetch upstream - asv machine --yes - asv dev | sed "/failed$/ s/^/##[error]/" | tee benchmarks.log + # TODO add `--durations` when we start using asv >= 0.5 (#46598) + asv run --quick --dry-run --python=same | sed "/failed$/ s/^/##[error]/" | tee benchmarks.log if grep "failed" benchmarks.log > /dev/null ; then exit 1 fi - if: ${{ steps.build.outcome == 'success' }} - - - name: Publish benchmarks artifact - uses: actions/upload-artifact@v3 - with: - name: Benchmarks log - path: asv_bench/benchmarks.log - if: failure() build_docker_dev_environment: name: Build Docker Dev Environment From bc291cdc19e9b292966acb0d1137779503085e94 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 1 Apr 2022 17:10:08 +0100 Subject: [PATCH 2/4] Restoring asv machine --- .github/workflows/code-checks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index 5592742c8d51f..d63dbf22e0581 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -141,6 +141,7 @@ jobs: run: | cd asv_bench # TODO add `--durations` when we start using asv >= 0.5 (#46598) + asv machine --yes asv run --quick --dry-run --python=same | sed "/failed$/ s/^/##[error]/" | tee benchmarks.log if grep "failed" benchmarks.log > /dev/null ; then exit 1 From 29be731c358411a5658852275a9eaa54d08e9cf2 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Fri, 1 Apr 2022 17:10:44 +0100 Subject: [PATCH 3/4] Fix TODO --- .github/workflows/code-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index d63dbf22e0581..aac6f4387a74a 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -140,8 +140,8 @@ jobs: - name: Run ASV benchmarks run: | cd asv_bench - # TODO add `--durations` when we start using asv >= 0.5 (#46598) asv machine --yes + # TODO add `--durations` when we start using asv >= 0.5 (#46598) asv run --quick --dry-run --python=same | sed "/failed$/ s/^/##[error]/" | tee benchmarks.log if grep "failed" benchmarks.log > /dev/null ; then exit 1 From e5f79d426ecba17e99084c328088cc2ed9ad35d2 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Sat, 2 Apr 2022 02:11:18 +0100 Subject: [PATCH 4/4] Unpinning asv --- environment.yml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 0dc9806856585..e991f29b8a727 100644 --- a/environment.yml +++ b/environment.yml @@ -9,7 +9,7 @@ dependencies: - pytz # benchmarks - - asv < 0.5.0 # 2022-02-08: v0.5.0 > leads to ASV checks running > 3 hours on CI + - asv # building # The compiler packages are meta-packages and install the correct compiler (activation) packages on the respective platforms. diff --git a/requirements-dev.txt b/requirements-dev.txt index 94709171739d2..22692da8f0ed4 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,7 +4,7 @@ numpy>=1.18.5 python-dateutil>=2.8.1 pytz -asv < 0.5.0 +asv cython>=0.29.24 black==22.3.0 cpplint