From e9fc0d1ca5ab789e6a70b4ec653874b5c693aaca Mon Sep 17 00:00:00 2001 From: David Smith Date: Thu, 17 Oct 2024 20:45:05 +0100 Subject: [PATCH 01/11] Update asv version. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a9b7ab00ef..5ea0a75817 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -asv==0.6.3 +asv==0.6.4 pre-commit From b40805fe61504b1645ac7fc36337c5a310628e20 Mon Sep 17 00:00:00 2001 From: David Smith Date: Thu, 17 Oct 2024 21:05:05 +0100 Subject: [PATCH 02/11] Updated actions versions. --- .github/workflows/benchmark.yml | 6 +++--- .github/workflows/publish-results.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index b1fa4a2c97..de81841fef 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -13,8 +13,8 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: '3.11' - name: Pull Changes @@ -28,7 +28,7 @@ jobs: - name: Install Requirements run: pip install -r requirements.txt - name: Cache Django - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: Django/* key: Django diff --git a/.github/workflows/publish-results.yml b/.github/workflows/publish-results.yml index 352f9ced2a..f6b702a15b 100644 --- a/.github/workflows/publish-results.yml +++ b/.github/workflows/publish-results.yml @@ -7,8 +7,8 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: '3.11' - name: Install Requirements From 41e200c3daea92d0f038b9bac267b6908ac30d3c Mon Sep 17 00:00:00 2001 From: David Smith Date: Thu, 17 Oct 2024 21:08:24 +0100 Subject: [PATCH 03/11] Unpin conda version. --- .github/workflows/benchmark.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index de81841fef..cfe1905f6b 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -20,11 +20,6 @@ jobs: - name: Pull Changes if: github.event_name != 'pull_request' run: git pull origin - - name: Setup Miniforge - uses: conda-incubator/setup-miniconda@v3 - with: - miniforge-version: "24.1.2-0" - activate-environment: asv-bench - name: Install Requirements run: pip install -r requirements.txt - name: Cache Django From 9b2ce0805da968c8df368fb59ea57e433f3f4576 Mon Sep 17 00:00:00 2001 From: David Smith Date: Thu, 17 Oct 2024 21:10:31 +0100 Subject: [PATCH 04/11] Added "build" dependency. --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 5ea0a75817..45b23408f9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ asv==0.6.4 pre-commit +build From dcbebd9813a22bba0ede5dcf5584ff969ff3de20 Mon Sep 17 00:00:00 2001 From: David Smith Date: Thu, 17 Oct 2024 21:22:26 +0100 Subject: [PATCH 05/11] Revert "Added "build" dependency." This reverts commit 9b2ce0805da968c8df368fb59ea57e433f3f4576. --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 45b23408f9..5ea0a75817 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ asv==0.6.4 pre-commit -build From bd41fc87d0c3c167952d8ee208334da439ab565a Mon Sep 17 00:00:00 2001 From: David Smith Date: Thu, 17 Oct 2024 21:23:58 +0100 Subject: [PATCH 06/11] Installed conda-build. https://github.com/airspeed-velocity/asv/commit/ebf0b651c170a332a2d2048b5bc68f962ba76777#diff-40c3303cc1d7180602932f7838826ce2d992556fa5c2c78fae521513d6b67bf2R452 --- .github/workflows/benchmark.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index cfe1905f6b..d141764457 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -30,6 +30,8 @@ jobs: - name: Run Benchmarks shell: bash -l {0} run: |- + conda activate base + conda install conda-build asv machine --machine ubuntu-latest --yes echo '```' >> $GITHUB_STEP_SUMMARY asv continuous --interleave-processes -a processes=2 --split --show-stderr 'HEAD^' 'HEAD' |\ From 3e8258bb45b500786776a0a11ea5032ae42ca0f0 Mon Sep 17 00:00:00 2001 From: David Smith Date: Thu, 17 Oct 2024 21:43:45 +0100 Subject: [PATCH 07/11] Added conda environment file with dependencies for asv build commands. Also added the required libmambapy dependency. https://asv.readthedocs.io/en/stable/asv.conf.json.html#conda-environment-file --- environment.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 environment.yml diff --git a/environment.yml b/environment.yml new file mode 100644 index 0000000000..0ef99abfd6 --- /dev/null +++ b/environment.yml @@ -0,0 +1,5 @@ +name: django-asv +dependencies: + - pip + - wheel + - libmambapy From 086b73bb47f695c6b2de2f212a81ceadc5ef51f9 Mon Sep 17 00:00:00 2001 From: David Smith Date: Thu, 17 Oct 2024 21:44:16 +0100 Subject: [PATCH 08/11] Revert "Installed conda-build." This reverts commit bd41fc87d0c3c167952d8ee208334da439ab565a. --- .github/workflows/benchmark.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index d141764457..cfe1905f6b 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -30,8 +30,6 @@ jobs: - name: Run Benchmarks shell: bash -l {0} run: |- - conda activate base - conda install conda-build asv machine --machine ubuntu-latest --yes echo '```' >> $GITHUB_STEP_SUMMARY asv continuous --interleave-processes -a processes=2 --split --show-stderr 'HEAD^' 'HEAD' |\ From 05735689159a09f2327e3911f28989171aa2b180 Mon Sep 17 00:00:00 2001 From: David Smith Date: Fri, 18 Oct 2024 06:59:30 +0100 Subject: [PATCH 09/11] Use conda-incubator to setup the conda environment. --- .github/workflows/benchmark.yml | 5 +++++ environment.yml | 1 + 2 files changed, 6 insertions(+) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index cfe1905f6b..0a4820db61 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -20,6 +20,11 @@ jobs: - name: Pull Changes if: github.event_name != 'pull_request' run: git pull origin + - name: Setup Miniforge + uses: conda-incubator/setup-miniconda@v3 + with: + activate-environment: asv-bench + environment-file: environment.yml - name: Install Requirements run: pip install -r requirements.txt - name: Cache Django diff --git a/environment.yml b/environment.yml index 0ef99abfd6..0e3a4abb79 100644 --- a/environment.yml +++ b/environment.yml @@ -2,4 +2,5 @@ name: django-asv dependencies: - pip - wheel + - conda-build - libmambapy From 65e734a4af5d1950b0789fa8378304d3d3fdd53c Mon Sep 17 00:00:00 2001 From: David Smith Date: Fri, 18 Oct 2024 07:05:01 +0100 Subject: [PATCH 10/11] List conda packages. --- .github/workflows/benchmark.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 0a4820db61..9ea0a41e43 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -35,6 +35,8 @@ jobs: - name: Run Benchmarks shell: bash -l {0} run: |- + conda info + conda list asv machine --machine ubuntu-latest --yes echo '```' >> $GITHUB_STEP_SUMMARY asv continuous --interleave-processes -a processes=2 --split --show-stderr 'HEAD^' 'HEAD' |\ From 1fd8d8ffa1addf1def096750afd09c0157dccacc Mon Sep 17 00:00:00 2001 From: David Smith Date: Fri, 18 Oct 2024 07:12:56 +0100 Subject: [PATCH 11/11] Use existing conda environment. --- .github/workflows/benchmark.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 9ea0a41e43..2f85e93907 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -39,7 +39,7 @@ jobs: conda list asv machine --machine ubuntu-latest --yes echo '```' >> $GITHUB_STEP_SUMMARY - asv continuous --interleave-processes -a processes=2 --split --show-stderr 'HEAD^' 'HEAD' |\ + asv continuous -E conda:asv-bench --interleave-processes -a processes=2 --split --show-stderr 'HEAD^' 'HEAD' |\ sed -n -E '/(before.*after.*ratio)|(BENCHMARKS)/,$p' >> out.txt cat out.txt >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY