diff --git a/README.md b/README.md index 284b07df..1d4503b1 100644 --- a/README.md +++ b/README.md @@ -126,6 +126,9 @@ Notes: - ![Python module](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/Python-logo-notext-22x22.png) This is a Python module, not a separated tool. - ![Tool](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/llave-inglesa-22x22.png) This is an independent tool, can be a binary or a Python script. +[**Lark**](https://pypi.org/project/Lark/) [![Python module](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/Python-logo-notext-22x22.png)](https://pypi.org/project/Lark/) [![PyPi dependency](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/PyPI_logo_simplified-22x22.png)](https://pypi.org/project/Lark/) [![Debian](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/debian-openlogo-22x22.png)](https://packages.debian.org/bullseye/python3-lark) +- Mandatory + [**PyYAML**](https://pypi.org/project/PyYAML/) [![Python module](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/Python-logo-notext-22x22.png)](https://pypi.org/project/PyYAML/) [![PyPi dependency](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/PyPI_logo_simplified-22x22.png)](https://pypi.org/project/PyYAML/) [![Debian](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/debian-openlogo-22x22.png)](https://packages.debian.org/bullseye/python3-yaml) - Mandatory diff --git a/debian/control b/debian/control index 9eedc72a..7417d357 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ X-Python3-Version: >= 3.6 Package: kibot Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, ${python3:Depends}, python3-yaml, kicad (>= 5.1.6) | kicad-nightly, python3-wxgtk4.0, python3-xvfbwrapper +Depends: ${misc:Depends}, ${python3:Depends}, python3-yaml, kicad (>= 5.1.6) | kicad-nightly, python3-wxgtk4.0, python3-xvfbwrapper, python3-lark Recommends: kibom.inti-cmnb (>= 1.8.0), kicost (>= 1.1.8), interactivehtmlbom.inti-cmnb (>= 2.4.1), imagemagick, librsvg2-bin, python3-xlsxwriter, rar, ghostscript, python3-lxml, python3-mistune, kikit, python3-markdown2 Suggests: pandoc, texlive-latex-base, texlive-latex-recommended, git, poppler-utils, kidiff, python3-numpy Description: KiCad Bot diff --git a/kibot/__init__.py b/kibot/__init__.py index 5d36cf53..dfa71ef1 100644 --- a/kibot/__init__.py +++ b/kibot/__init__.py @@ -6,4 +6,4 @@ __email__ = 'stropea@inti.gob.ar' __url__ = 'https://github.com/INTI-CMNB/KiBot/' __status__ = 'stable' __version__ = '1.6.2' -__pypi_deps__ = ['kiauto', 'pyyaml', 'xlsxwriter', 'colorama', 'requests', 'qrcodegen', 'markdown2'] +__pypi_deps__ = ['kiauto', 'pyyaml', 'xlsxwriter', 'colorama', 'requests', 'qrcodegen', 'markdown2', 'lark'] diff --git a/kibot/dep_downloader.py b/kibot/dep_downloader.py index 5a346008..9efb107d 100644 --- a/kibot/dep_downloader.py +++ b/kibot/dep_downloader.py @@ -95,6 +95,11 @@ Dependencies: url: https://www.blender.org/ debian: blender arch: blender + - name: Lark + python_module: true + role: mandatory + debian: python3-lark + arch: python-lark """ from copy import deepcopy import fnmatch diff --git a/src/kibot-check b/src/kibot-check index a25be710..7118861a 100755 --- a/src/kibot-check +++ b/src/kibot-check @@ -805,6 +805,40 @@ deps = '{\ "url": null,\ "url_down": null\ },\ + "Lark": {\ + "arch": "python-lark",\ + "command": "lark",\ + "comments": [],\ + "deb_package": "python3-lark",\ + "downloader": null,\ + "downloader_str": null,\ + "extra_arch": null,\ + "extra_deb": null,\ + "help_option": "--version",\ + "importance": 1000000,\ + "in_debian": true,\ + "is_kicad_plugin": false,\ + "is_python": true,\ + "module_name": "lark",\ + "name": "Lark",\ + "no_cmd_line_version": false,\ + "no_cmd_line_version_old": false,\ + "output": "global",\ + "plugin_dirs": null,\ + "pypi_name": "Lark",\ + "roles": [\ + {\ + "desc": null,\ + "mandatory": true,\ + "max_version": null,\ + "output": "global",\ + "version": null\ + }\ + ],\ + "tests": [],\ + "url": null,\ + "url_down": null\ + },\ "OpenSCAD": {\ "arch": "openscad",\ "command": "openscad",\