diff --git a/README.md b/README.md index a5963d36..e521aa7b 100644 --- a/README.md +++ b/README.md @@ -112,9 +112,6 @@ 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. -[**Distutils**](https://pypi.org/project/Distutils/) [![Python module](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/Python-logo-notext-22x22.png)](https://pypi.org/project/Distutils/) [![Debian](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/debian-openlogo-22x22.png)](https://packages.debian.org/bullseye/python3-distutils) -- 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 564bbfc3..ce0cadba 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-distutils, python3-yaml, kicad (>= 5.1.6), python3-wxgtk4.0 +Depends: ${misc:Depends}, ${python3:Depends}, python3-yaml, kicad (>= 5.1.6), python3-wxgtk4.0 Recommends: kibom.inti-cmnb (>= 1.8.0), kicost (>= 1.1.8), interactivehtmlbom.inti-cmnb (>= 2.4.1), pcbdraw (>= 0.9.0), imagemagick, librsvg2-bin, python3-xlsxwriter, rar, ghostscript, python3-lxml Suggests: pandoc, texlive-latex-base, texlive-latex-recommended, git, poppler-utils Description: KiCad Bot diff --git a/kibot/registrable.py b/kibot/registrable.py index d1f25d82..3874b537 100644 --- a/kibot/registrable.py +++ b/kibot/registrable.py @@ -158,6 +158,5 @@ class RegDependency(Registrable): # Here we register some global dependencies RegDependency.register(ToolDependency('global', 'Colorama', is_python=True, roles=ToolDependencyRole(desc='get color messages in a portable way'))) -RegDependency.register(ToolDependency('global', 'Distutils', is_python=True)) RegDependency.register(ToolDependency('global', 'Requests', is_python=True)) RegDependency.register(ToolDependency('global', 'PyYAML', is_python=True, deb='python3-yaml', module_name='yaml')) diff --git a/src/kibot-check b/src/kibot-check index dfa45843..5539bfc2 100755 --- a/src/kibot-check +++ b/src/kibot-check @@ -46,34 +46,6 @@ deps = '{\ "url": null,\ "url_down": null\ },\ - "Distutils": {\ - "command": "distutils",\ - "deb_package": "python3-distutils",\ - "downloader": null,\ - "extra_deb": null,\ - "help_option": "--version",\ - "importance": 1000000,\ - "in_debian": true,\ - "is_kicad_plugin": false,\ - "is_python": true,\ - "module_name": "distutils",\ - "name": "Distutils",\ - "no_cmd_line_version": false,\ - "no_cmd_line_version_old": false,\ - "output": "global",\ - "plugin_dirs": null,\ - "pypi_name": "Distutils",\ - "roles": [\ - {\ - "desc": null,\ - "mandatory": true,\ - "output": "global",\ - "version": null\ - }\ - ],\ - "url": null,\ - "url_down": null\ - },\ "Ghostscript": {\ "command": "ghostscript",\ "deb_package": "ghostscript",\ @@ -313,7 +285,11 @@ deps = '{\ "desc": null,\ "mandatory": true,\ "output": "pdf_sch_print",\ - "version": null\ + "version": [\ + 1,\ + 5,\ + 4\ + ]\ },\ {\ "desc": null,\ @@ -349,7 +325,11 @@ deps = '{\ "desc": null,\ "mandatory": true,\ "output": "svg_sch_print",\ - "version": null\ + "version": [\ + 1,\ + 5,\ + 4\ + ]\ },\ {\ "desc": null,\