Skip to content

Commit 1d9202c

Browse files
authored
Fix run_asvs workflow (#36)
1 parent e4fa565 commit 1d9202c

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

.github/workflows/process_results.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
# Results and other data are stored away from the main branch.
1212
# This keeps the main branch clean and allows us to clear out
1313
# objects / history after being built up for long periods of time.
14-
BRANCH_NAME: pandas_20240109
14+
BRANCH_NAME: pandas_20250109
1515
PYTHON_VERSION: 3.12
1616

1717
permissions:
@@ -54,9 +54,9 @@ jobs:
5454
- name: Show environment packages
5555
run: uv pip freeze
5656

57-
- name: Move results directory
57+
- name: Copy results directory
5858
run: |
59-
mv asv-runner/data/results asv_bench/results
59+
cp -r asv-runner/data/results asv_bench/results
6060
6161
- name: Publish ASV Benchmarks
6262
run: cd asv_bench && asv publish

.github/workflows/run_asvs.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
# Results and other data are stored away from the main branch.
1414
# This keeps the main branch clean and allows us to clear out
1515
# objects / history after being built up for long periods of time.
16-
BRANCH_NAME: pandas_20240109
16+
BRANCH_NAME: pandas_20250109
1717

1818
permissions:
1919
contents: read
@@ -66,11 +66,6 @@ jobs:
6666
repository: asv-runner
6767
file_pattern: 'data/latest_sha.txt'
6868

69-
- name: Move results directory
70-
if: ${{ steps.new-commit.outputs.new_commit == 'yes' }}
71-
run: |
72-
mv asv-runner/data/results asv_bench/results
73-
7469
- name: Set up Conda
7570
if: ${{ steps.new-commit.outputs.new_commit == 'yes' }}
7671
uses: ./.github/actions/setup-conda
@@ -87,15 +82,19 @@ jobs:
8782
asv run --machine=asvrunner --python=same --set-commit-hash=$(git rev-parse HEAD) --show-stderr
8883
8984
- name: Update asv-runner branch
85+
# In case there was a push by another job.
9086
if: ${{ steps.new-commit.outputs.new_commit == 'yes' }}
9187
run: |
9288
cd asv-runner
93-
git pull
89+
git fetch && git pull
9490
9591
- name: Move results into asv-runner
9692
if: ${{ steps.new-commit.outputs.new_commit == 'yes' }}
9793
run: |
98-
cp -r asv_bench/results/ asv-runner/data/results/
94+
mkdir -p asv-runner/data/results/asvrunner/
95+
cp asv_bench/results/benchmarks.json asv-runner/data/results/
96+
cp asv_bench/results/asvrunner/machine.json asv-runner/data/results/asvrunner/
97+
cp asv_bench/results/asvrunner/$(git rev-parse HEAD)-existing*.json asv-runner/data/results/asvrunner/
9998
10099
- name: Commit results to branch
101100
if: ${{ steps.new-commit.outputs.new_commit == 'yes' }}

ci/make_issues.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ def run(input_path: str | Path):
6767
.drop_duplicates(subset="sha")
6868
.sort_values("date")["sha"]
6969
.unique()
70-
.tolist()[-20:]
70+
.tolist()[-40:]
7171
)
72+
print("Number of regressions to raise issues for:", len(regression_shas))
7273
for sha in regression_shas:
7374
# Avoid GitHub rate limits
7475
time.sleep(2)

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ select = [
7070
"Q", # flake8-quotes
7171
"RUF", # Ruff-specific rules
7272
"SIM", # flake8-simplify
73-
"T20", # flake8-print
7473
"UP", # pyupgrade
7574
"W", # pycodestyle - warning
7675
"YTT", # flake8-2020

0 commit comments

Comments
 (0)