Fixed two bugs (bad __requires__ regex + unexpected kwarg in helpers.parser)

Author: dhondta

src/tinyscript/VERSION.txt

@@ -1 +1 @@
-1.30.0
+1.30.1

src/tinyscript/argreparse.py

@@ -421,7 +421,7 @@ def _check_requirements(self, requires):
                               .format(str(requires)))
             requires = {}
         for m, v in requires.items():
-            o, v = re.match(r"^([<>]|[<>=!]=|)(.*)$", v).groups()
+            o, v = re.match(r"^([<>=!]=|[<>]|)(.*)$", v).groups()
             operator = {'': op.ge, '<': op.lt, '>': op.gt, '<=': op.le, '>=': op.ge, '==': op.eq, '!=': op.ne}[o]
             desired, actual = Version(v), Version(get_version(m))
             if not operator(actual, desired):

src/tinyscript/helpers/parser.py

@@ -22,7 +22,7 @@ def get_parsers(tool, logger=None, **kwargs):
         tool = Path(which(tool), expand=True)
     # copy the target tool to modify it so that its parser tree can be retrieved
     ntool = tool.copy(tmp.joinpath(f"_{tool.basename}.py"))
-    ntool.write_text(ntool.read_text().replace("if __name__ == '__main__':", f"{kwargs.get('cond', '')}\ndef main():") \
+    ntool.write_text(ntool.read_text().replace("if __name__ == '__main__':", f"{kwargs.pop('cond', '')}\ndef main():") \
                                       .replace("if __name__ == \"__main__\":", "def main():") \
                                       .replace("initialize(", "return parser\n    initialize(") \
                                       .rstrip("\n") + "\n\nif __name__ == '__main__':\n    main()\n")