From 651f3890d5738e179073539878db5561093e675e Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Wed, 31 Aug 2022 12:59:52 -0300 Subject: [PATCH] [Diff] Added KiAuto as dependency Related to #265 --- README.md | 4 +++- kibot/out_diff.py | 6 ++++++ src/kibot-check | 14 ++++++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f6023f12..1fbd6348 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,9 @@ Notes: [**KiCad Automation tools**](https://github.com/INTI-CMNB/KiAuto) v2.0.0 [![Tool](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/llave-inglesa-22x22.png)](https://github.com/INTI-CMNB/KiAuto)![PyPi dependency](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/PyPI_logo_simplified-22x22.png) ![Auto-download](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/auto_download-22x22.png) - Mandatory for: `gencad`, `netlist`, `pdf_pcb_print`, `pdf_sch_print`, `render_3d`, `run_drc`, `run_erc`, `step`, `svg_pcb_print`, `svg_sch_print`, `update_xml` -- Optional to print the page frame in GUI mode for `pcb_print` +- Optional to: + - Compare schematics for `diff` (v2.0.0) + - Print the page frame in GUI mode for `pcb_print` (v1.6.7) [**KiCost**](https://github.com/hildogjr/KiCost) v1.1.8 [![Tool](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/llave-inglesa-22x22.png)](https://github.com/hildogjr/KiCost) ![Auto-download](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/auto_download-22x22.png) - Mandatory for `kicost` diff --git a/kibot/out_diff.py b/kibot/out_diff.py index 669ded2c..da505add 100644 --- a/kibot/out_diff.py +++ b/kibot/out_diff.py @@ -15,6 +15,9 @@ Dependencies: id: KiDiff - from: Git role: Compare with files in the repo + - from: KiAuto + role: Compare schematics + version: 2.0.0 """ from hashlib import sha1 import os @@ -234,6 +237,9 @@ class DiffOptions(BaseOptions): self.command = self.ensure_tool('KiDiff') if self.old_type == 'git' or self.new_type == 'git': self.git_command = self.ensure_tool('Git') + if not self.pcb: + # We need eeschema_do for this + self.ensure_tool('KiAuto') # Solve the cache dir remove_cache = False if not self.cache_dir: diff --git a/src/kibot-check b/src/kibot-check index 4418501b..db4c9e08 100755 --- a/src/kibot-check +++ b/src/kibot-check @@ -251,17 +251,27 @@ deps = '{\ "downloader_str": "pytool",\ "extra_deb": null,\ "help_option": "--version",\ - "importance": 110001,\ + "importance": 110002,\ "in_debian": false,\ "is_kicad_plugin": false,\ "is_python": false,\ "name": "KiCad Automation tools",\ "no_cmd_line_version": false,\ "no_cmd_line_version_old": false,\ - "output": "gencad",\ + "output": "diff",\ "plugin_dirs": null,\ "pypi_name": "kiauto",\ "roles": [\ + {\ + "desc": "Compare schematics",\ + "mandatory": false,\ + "output": "diff",\ + "version": [\ + 2,\ + 0,\ + 0\ + ]\ + },\ {\ "desc": null,\ "mandatory": true,\