Merge branch 'main' into sklearn_depend

dedupeio · May 27, 2022 · adbb8c8 · adbb8c8
2 parents 9819003 + a503691
commit adbb8c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/scripts/asv_markdown.py b/.github/scripts/asv_markdown.py
@@ -25,10 +25,9 @@ def is_float(element):
 
 def to_markdown(data):
 
-    preamble = """# {tests} [(diff)](https://github.com/dedupeio/dedupe/compare/{base_commit}...{head_commit})
+    preamble = """# {tests} ([diff](https://github.com/dedupeio/dedupe/compare/{base_commit}...{head_commit})):
 |  |       before       |    after  |       ratio | benchmark  |
-|- |-: |-: |-: |-|
-||     `{base_branch}`        |   `{head_branch}` | ||\n""".format(
+|- |-: |-: |-: |-|\n""".format(
         **data
     )
 
@@ -42,7 +41,7 @@ def to_markdown(data):
 def parse(asv_input):
 
     result = re.match(
-        r"^\n(?P<tests>.*?)\n       before           after         ratio\n     \[(?P<base_commit>.+)\]       \[(?P<head_commit>.+)\]\n     <(?P<base_branch>.+)>           <(?P<head_branch>.+)>\n(?P<raw_comparisons>.*)",
+        r"^\n(?P<tests>.*?):\n\n       before           after         ratio\n     \[(?P<base_commit>.+)\]       \[(?P<head_commit>.+)\]\n     <(?P<base_branch>.+)>           <(?P<head_branch>.+)>\n(?P<raw_comparisons>.*)",
         asv_input,
         re.DOTALL,
     )

diff --git a/.github/workflows/benchmark-bot.yml b/.github/workflows/benchmark-bot.yml
@@ -88,5 +88,5 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: ENV_VARS["BENCH_OUTPUT"] + '\n[(logs)](' + run_url + ')'
+              body: ENV_VARS["BENCH_OUTPUT"] + '\n\n[(logs)](' + run_url + ')'
             })