Use new sketches report key names

The breaking change to the report required to provide data for all sketches offered the opportunity to update key names without any potential for additional disruption.

"sketch" was changed to "sketches" and "fqbn" was changed to "board".

Author: per1234

reportsizedeltas.py

@@ -57,7 +57,7 @@ class ReportSizeDeltas:
 
     class ReportKeys:
         """Key names used in the sketches report dictionary"""
-        fqbn = "fqbn"
+        board = "board"
         commit_hash = "commit_hash"
         commit_url = "commit_url"
         sizes = "sizes"
@@ -68,7 +68,7 @@ class ReportKeys:
         delta = "delta"
         minimum = "minimum"
         maximum = "maximum"
-        sketch = "sketch"
+        sketches = "sketches"
         compilation_success = "compilation_success"
 
     def __init__(self, repository_name, artifact_name, token):
@@ -254,7 +254,7 @@ def get_sketches_reports(self, artifact_folder_object):
                 # Combine sketches reports into an array
                 with open(file=artifact_folder + "/" + report_filename) as report_file:
                     report_data = json.load(report_file)
-                    if type(report_data[self.ReportKeys.sketch]) is not list:
+                    if self.ReportKeys.sketches not in report_data:
                         # Sketches reports use the old format, skip
                         print("Old format sketches report found, skipping")
                         continue
@@ -282,7 +282,7 @@ def generate_report(self, sketches_reports):
         for row_number, fqbn_data in enumerate(iterable=sketches_reports, start=1):
             # Add a row to the report
             row = ["" for _ in range(len(summary_report_data[0]))]
-            row[0] = fqbn_data[self.ReportKeys.fqbn]
+            row[0] = fqbn_data[self.ReportKeys.board]
             summary_report_data.append(row)
 
             # Populate the row with data
@@ -303,11 +303,11 @@ def generate_report(self, sketches_reports):
         for row_number, fqbn_data in enumerate(iterable=sketches_reports, start=1):
             # Add a row to the report
             row = ["" for _ in range(len(full_report_data[0]))]
-            row[0] = fqbn_data[self.ReportKeys.fqbn]
+            row[0] = fqbn_data[self.ReportKeys.board]
             full_report_data.append(row)
 
             # Populate the row with data
-            for sketch in fqbn_data[self.ReportKeys.sketch]:
+            for sketch in fqbn_data[self.ReportKeys.sketches]:
                 for size_data in sketch[self.ReportKeys.sizes]:
                     # Determine column number for this memory type
                     column_number = get_report_column_number(

tests/data/size-deltas-reports-new/arduino-avr-leonardo.json

@@ -1,8 +1,8 @@
 {
-  "fqbn": "arduino:avr:leonardo",
+  "board": "arduino:avr:leonardo",
   "commit_hash": "d8fd302",
   "commit_url": "https://example.com/foo",
-  "sketch": [
+  "sketches": [
     {
       "name": "examples/Bar",
       "compilation_success": true,

tests/data/size-deltas-reports-new/arduino-avr-uno.json

@@ -1,8 +1,8 @@
 {
-  "fqbn": "arduino:avr:uno",
+  "board": "arduino:avr:uno",
   "commit_hash": "d8fd302",
   "commit_url": "https://example.com/foo",
-  "sketch": [
+  "sketches": [
     {
       "name": "examples/Bar",
       "compilation_success": true,

tests/test_reportsizedeltas.py

@@ -379,7 +379,7 @@ def test_get_artifact(tmp_path, test_artifact_name, expected_success):
                 {
                     report_keys.commit_hash: "d8fd302",
                     report_keys.commit_url: "https://example.com/foo",
-                    report_keys.fqbn: "arduino:avr:leonardo",
+                    report_keys.board: "arduino:avr:leonardo",
                     report_keys.sizes: [
                         {
                             report_keys.delta: {
@@ -400,7 +400,7 @@ def test_get_artifact(tmp_path, test_artifact_name, expected_success):
                             report_keys.name: "RAM for global variables"
                         }
                     ],
-                    report_keys.sketch: [
+                    report_keys.sketches: [
                         {
                             report_keys.compilation_success: True,
                             report_keys.name: "examples/Bar",
@@ -466,7 +466,7 @@ def test_get_artifact(tmp_path, test_artifact_name, expected_success):
                 {
                     report_keys.commit_hash: "d8fd302",
                     report_keys.commit_url: "https://example.com/foo",
-                    report_keys.fqbn: "arduino:avr:uno",
+                    report_keys.board: "arduino:avr:uno",
                     report_keys.sizes: [
                         {
                             report_keys.delta: {
@@ -487,7 +487,7 @@ def test_get_artifact(tmp_path, test_artifact_name, expected_success):
                             report_keys.name: "RAM for global variables"
                         }
                     ],
-                    report_keys.sketch: [
+                    report_keys.sketches: [
                         {
                             report_keys.compilation_success: True,
                             report_keys.name: "examples/Bar",