Fix formatting issue in generate_stats

Update to new (public) sheet in chromium account. Fix issue with python newline on concatenated string. Ensure all tables are sorted by date. Bug: angleproject:3435 Change-Id: I5de178409dec1e0dcf1467e4f0fe8cf85ea23c08 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1609939Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>

Fix formatting issue in generate_stats
cd3011fb · Jonah Ryan-Davis · Commit Bot · 52bfbd35 · cd3011fb · cd3011fb
Commit cd3011fb authored May 13, 2019 by Jonah Ryan-Davis Committed by Commit Bot May 17, 2019
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

dEQP-Charts.md doc/dEQP-Charts.md +0 -0

generate_stats.py scripts/generate_stats.py +9 -5

No files found.
--- a/doc/dEQP-Charts.md
+++ b/doc/dEQP-Charts.md
--- a/scripts/generate_stats.py
+++ b/scripts/generate_stats.py
@@ -525,6 +525,10 @@ def update_filters(service, spreadsheet_id, headers, info, spreadsheet):
                                    "startColumnIndex": 0,
                                    "endColumnIndex": len(headers[sheet_name])
                                },
+                                "sortSpecs": [{
+                                    "dimensionIndex": headers[sheet_name].index('date'),
+                                    "sortOrder": "ASCENDING"
+                                }],
                                "criteria": {
                                    str(headers[sheet_name].index('duplicate')): {
                                        "hiddenValues":
@@ -617,9 +621,9 @@ def generate_duplicate_formula(headers, filter_columns):
    for i in range(len(headers)):
        if headers[i] == filter_columns[0]:
            col = str(i + 1)
-            return "IF(INDIRECT(ADDRESS(ROW(), " + col + "))=INDIRECT(ADDRESS(ROW() - 1, " + col +
-            "))," + generate_duplicate_formula(
-                headers, filter_columns[1:]) + ",0)"
+            formula = "IF(INDIRECT(ADDRESS(ROW(), " + col + "))=INDIRECT(ADDRESS(ROW() - 1, " + \
+                col + "))," + generate_duplicate_formula(headers, filter_columns[1:]) + ",0)"
+            return formula
    # Next column not found, remove from recursion but just return whatever the next one is
    return generate_duplicate_formula(headers, filter_columns[1:])

@@ -728,10 +732,10 @@ def parse_args():
        '[default=<home>/.auth]')
    parser.add_argument(
        '--spreadsheet',
-        default='1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw',
+        default='1uttk1z8lJ4ZsUY7wMdFauMzUxb048nh5l52zdrAznek',
        nargs='?',
        help='ID of the spreadsheet to write stats to. '
-        "[default='1D6Yh7dAPP-aYLbX3HHQD8WubJV9XPuxvkKowmn2qhIw']")
+        "[default='1uttk1z8lJ4ZsUY7wMdFauMzUxb048nh5l52zdrAznek']")
    parser.add_argument(
        '--verbosity',
        default='INFO',