annet 0.16.23__tar.gz → 0.16.25__tar.gz

{annet-0.16.23/annet.egg-info → annet-0.16.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.23
+Version: 0.16.25
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-0.16.23 → annet-0.16.25}/annet/annlib/jsontools.py

@@ -4,6 +4,7 @@ import copy
 import fnmatch
 import json
 from collections.abc import Mapping, Sequence
+from operator import itemgetter
 from typing import Any, Dict, List, Optional
 
 import jsonpatch
@@ -73,7 +74,7 @@ def _ensure_pointer_exists(doc: Dict[str, Any], pointer: jsonpointer.JsonPointer
 
 def make_patch(old: Dict[str, Any], new: Dict[str, Any]) -> List[Dict[str, Any]]:
     """Generate a JSON patch by comparing the old document with the new one."""
-    return jsonpatch.make_patch(old, new).patch
+    return sorted(jsonpatch.make_patch(old, new).patch, key=itemgetter("path"))
 
 
 def apply_patch(content: Optional[bytes], patch_bytes: bytes) -> bytes:

{annet-0.16.23 → annet-0.16.25}/annet/api/__init__.py

@@ -799,12 +799,20 @@ def guess_hw(config_text: str):
         hw = hw_provider.vendor_to_hw(vendor)
         fmtr = tabparser.make_formatter(hw)
         rb = rulebook.get_rulebook(hw)
-        config = tabparser.parse_to_tree(config_text, fmtr.split)
+        try:
+            config = tabparser.parse_to_tree(config_text, fmtr.split)
+        except Exception:
+            continue
         pre = patching.make_pre(patching.make_diff({}, config, rb, []))
         metric = _count_pre_score(pre)
         scores[metric] = hw
+
+    if not scores:
+        raise RuntimeError("No formatter was guessed")
+
     max_score = max(scores.keys())
     hw = scores[max_score]
+
     return hw, max_score
 
 

{annet-0.16.23 → annet-0.16.25/annet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annet
-Version: 0.16.23
+Version: 0.16.25
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT