diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index b1fa4a2c97..2f85e93907 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 @@ -23,21 +23,23 @@ jobs: - name: Setup Miniforge uses: conda-incubator/setup-miniconda@v3 with: - miniforge-version: "24.1.2-0" activate-environment: asv-bench + environment-file: environment.yml - 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 - 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' |\ + 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 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 diff --git a/environment.yml b/environment.yml new file mode 100644 index 0000000000..0e3a4abb79 --- /dev/null +++ b/environment.yml @@ -0,0 +1,6 @@ +name: django-asv +dependencies: + - pip + - wheel + - conda-build + - libmambapy 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