annet 3.1.2__py3-none-any.whl → 3.1.4__py3-none-any.whl

annet/annlib/rulebook/common.py

@@ -366,7 +366,7 @@ def apply(hw, do_commit, do_finalize, **_):
     elif hw.H3C:
         before.add_cmd(Command("system-view"))
         if do_finalize:
-            after.add_cmd(Command("save force", timeout=20))
+            after.add_cmd(Command("save force", timeout=90))
     else:
         raise Exception("unknown hw %s" % hw)
 

annet/generators/entire.py

@@ -24,6 +24,7 @@ class Entire(BaseGenerator):
     TYPE = "ENTIRE"
     TAGS: List[str] = []
     REQUIRED_PACKAGES: FrozenSet[str] = frozenset()
+    ENSURE_END_NEWLINE = False
 
     def __init__(self, storage):
         self.storage = storage
@@ -90,4 +91,7 @@ class Entire(BaseGenerator):
             assert re.search(r"\bNone\b", text) is None, \
                 "Found 'None' in yield result: %s" % text
             parts.append(text)
-        return "\n".join(parts)
+        ret = "\n".join(parts)
+        if self.ENSURE_END_NEWLINE and not ret.endswith("\n"):
+            ret += "\n"
+        return ret

{annet-3.1.2.dist-info → annet-3.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annet
-Version: 3.1.2
+Version: 3.1.4
 Summary: annet
 Home-page: https://github.com/annetutil/annet
 License: MIT

{annet-3.1.2.dist-info → annet-3.1.4.dist-info}/RECORD

@@ -76,13 +76,13 @@ annet/annlib/rbparser/ordering.py,sha256=XknggB92N4IbhHBZZHL0StwCCITt8mkho4D4Nu5
 annet/annlib/rbparser/platform.py,sha256=d1jFH8hGMOf_qiveKE4H-c0OfNnzwmt2VYpSiSOn9qc,42
 annet/annlib/rbparser/syntax.py,sha256=iZ7Y-4QQBw4L3UtjEh54qisiRDhobl7HZxFNdP8mi54,3577
 annet/annlib/rulebook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annet/annlib/rulebook/common.py,sha256=-x4dYuKDi1T5lxk1PRWQ91FGRlV4UAJ0sQC9vnbhzWw,17016
+annet/annlib/rulebook/common.py,sha256=h2x-NWnOboED4jUHdywbB0lcl1wbI1hmlVF4n2l87OU,17016
 annet/api/__init__.py,sha256=EMGUgt3pTi2MDF8DfXlS8PGX2zT0iGLY01R6QlQHvGg,33305
 annet/configs/context.yml,sha256=RVLrKLIHpCty7AGwOnmqf7Uu0iZQCn-AjYhophDJer8,259
 annet/configs/logging.yaml,sha256=EUagfir99QqA73Scc3k7sfQccbU3E1SvEQdyhLFtCl4,997
 annet/generators/__init__.py,sha256=wJbNLI1bMppE71tnjJrqNGtbtLZ_gdRd-HytdZPzBiY,16451
 annet/generators/base.py,sha256=rgQLcQBPZm4ecbKmRhVOpBR-GFJAiVfdb_y5f2-LUR8,3670
-annet/generators/entire.py,sha256=Oe7d0VuIn2sLcOKuRVQW9uR8Vuirg0edekFMSZCMnI4,2786
+annet/generators/entire.py,sha256=mfnKtn5GcHiqjGjuhETkOVm-0ppMELAPsmg5jQrYTZc,2922
 annet/generators/exceptions.py,sha256=GPXTBgn2xZ3Ev_bdOPlfCLGRC1kQHe_dEq88S-uyi5s,151
 annet/generators/jsonfragment.py,sha256=Cl43t9_OtNWRxesk3B69h60KvD37tiK9W7sLLmppAT4,4379
 annet/generators/partial.py,sha256=XI01KDA--XwjSEU33SOQCCJZRXFq5boRz1uJA8lVA1g,3502
@@ -197,8 +197,8 @@ annet/vendors/library/optixtrans.py,sha256=425akCUYKdeM7qV1ZUvfRjho_bWoWhHotoo0j
 annet/vendors/library/pc.py,sha256=UOfaBtlFUGiAF9qsjlhgWNDJz31SqlMdtyYqoYtn6GM,641
 annet/vendors/library/ribbon.py,sha256=3DJBZ5wOoi0mkfqLpNeRJIkThVuRqSiJ_67G7eoKZzs,782
 annet/vendors/library/routeros.py,sha256=pvMG3MJpc4-pUBYnEzOXWfK0vqM7l0SlxwlGywaPovk,661
-annet-3.1.2.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
-annet-3.1.2.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
+annet-3.1.4.dist-info/licenses/AUTHORS,sha256=rh3w5P6gEgqmuC-bw-HB68vBCr-yIBFhVL0PG4hguLs,878
+annet-3.1.4.dist-info/licenses/LICENSE,sha256=yPxl7dno02Pw7gAcFPIFONzx_gapwDoPXsIsh6Y7lC0,1079
 annet_generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annet_generators/example/__init__.py,sha256=OJ77uj8axc-FIyIu_Xdcnzmde3oQW5mk5qbODkhuVc8,355
 annet_generators/example/hostname.py,sha256=RloLzNVetEoWPLITzfJ13Nk3CC0yi-cZB1RTd6dnuhI,2541
@@ -211,8 +211,8 @@ annet_generators/rpl_example/generator.py,sha256=EWah19gOH8G-QyNyWqxCqdRi0BK7GbM
 annet_generators/rpl_example/items.py,sha256=d99HSXDHFjZq511EvGhIqRTWK3F4ZsCWfdUqFYQcyhE,772
 annet_generators/rpl_example/mesh.py,sha256=z_WgfDZZ4xnyh3cSf75igyH09hGvtexEVwy1gCD_DzA,288
 annet_generators/rpl_example/route_policy.py,sha256=z6nPb0VDeQtKD1NIg9sFvmUxBD5tVs2frfNIuKdM-5c,2318
-annet-3.1.2.dist-info/METADATA,sha256=PbY14jcMd_yKOp25y0O3CptGLmqz_kDv7-aL2tdivps,815
-annet-3.1.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-annet-3.1.2.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
-annet-3.1.2.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
-annet-3.1.2.dist-info/RECORD,,
+annet-3.1.4.dist-info/METADATA,sha256=Q7ZpCjkgFIsvMzZDWHS4rr9JIsPjumv3CQDbHr8iFdc,815
+annet-3.1.4.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+annet-3.1.4.dist-info/entry_points.txt,sha256=5lIaDGlGi3l6QQ2ry2jZaqViP5Lvt8AmsegdD0Uznck,192
+annet-3.1.4.dist-info/top_level.txt,sha256=QsoTZBsUtwp_FEcmRwuN8QITBmLOZFqjssRfKilGbP8,23
+annet-3.1.4.dist-info/RECORD,,

{annet-3.1.2.dist-info → annet-3.1.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any