Merge remote-tracking branch 'origin/develop' into xap

lib/python/qmk/cli/migrate.py

@@ -47,9 +47,12 @@ def migrate(cli):
     files = _candidate_files(cli.args.keyboard)
 
     # Filter down keys if requested
-    keys = info_map.keys()
+    keys = list(filter(lambda key: info_map[key].get("to_json", True), info_map.keys()))
     if cli.args.filter:
         keys = list(set(keys) & set(cli.args.filter))
+        rejected = set(cli.args.filter) - set(keys)
+        for key in rejected:
+            cli.log.info(f'{{fg_yellow}}Skipping {key} as migration not possible...')
 
     cli.log.info(f'{{fg_green}}Migrating keyboard {{fg_cyan}}{cli.args.keyboard}{{fg_green}}.{{fg_reset}}')
 

lib/python/qmk/info.py

@@ -501,6 +501,9 @@ def _config_to_json(key_type, config_value):
     """Convert config value using spec
     """
     if key_type.startswith('array'):
+        if key_type.count('.') > 1:
+            raise Exception(f"Conversion of {key_type} not possible")
+
         if '.' in key_type:
             key_type, array_type = key_type.split('.', 1)
         else: