templates
/
KiBot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Dependencies] Added message about KiBot repo 

For packages that aren't official
This commit is contained in:
Salvador E. Tropea 2024-01-24 11:17:33 -03:00
parent ec3fec2c93
commit 2ff4035c94
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kibot/dep_downloader.py
View File

@ -857,6 +857,8 @@ def check_tool_dep_get_ver(context, dep, fatal=False):
do_log_err('Download page: '+dep.url_down, fatal) do_log_err('Download page: '+dep.url_down, fatal)
if dep.deb_package: if dep.deb_package:
do_log_err('Debian package: '+dep.deb_package, fatal) do_log_err('Debian package: '+dep.deb_package, fatal)
if not dep.in_debian:
do_log_err('- This is not an official package, use KiBot repo (https://github.com/set-soft/debian)', fatal)
if dep.extra_deb: if dep.extra_deb:
do_log_err('- Recommended extra Debian packages: '+' '.join(dep.extra_deb), fatal) do_log_err('- Recommended extra Debian packages: '+' '.join(dep.extra_deb), fatal)
if dep.arch: if dep.arch:
@ -912,10 +914,11 @@ class ToolDependency(object):
self.name = name self.name = name
# Name of the .deb # Name of the .deb
if deb is None: if deb is None:
if is_python: if not is_python:
self.deb_package = 'python3-'+name.lower()
else:
self.deb_package = name.lower() self.deb_package = name.lower()
# We don't use it for python modules:
# else:
# self.deb_package = 'python3-'+name.lower()
else: else:
self.deb_package = deb self.deb_package = deb
self.is_python = is_python self.is_python = is_python

2
tests/test_plot/test_dep_downloader.py
View File

@ -214,7 +214,6 @@ def test_check_tool_dep_get_ver_1(test_dir, caplog, monkeypatch):
dep = """ dep = """
- name: FooBar - name: FooBar
version: 1.3.0.4 version: 1.3.0.4
debian: foobar-debian
extra_deb: ['foobar-extra-debian', 'deb2'] extra_deb: ['foobar-extra-debian', 'deb2']
arch: foobar-arch (AUR) arch: foobar-arch (AUR)
extra_arch: ['foobar-extra-arch', 'aur2'] extra_arch: ['foobar-extra-arch', 'aur2']
@ -228,6 +227,7 @@ def test_check_tool_dep_get_ver_1(test_dir, caplog, monkeypatch):
assert "Recommended extra Arch packages: foobar-extra-arch aur2" in caplog.text assert "Recommended extra Arch packages: foobar-extra-arch aur2" in caplog.text
assert "Recommended extra Debian packages: foobar-extra-debian deb2" in caplog.text assert "Recommended extra Debian packages: foobar-extra-debian deb2" in caplog.text
assert "Used to do this and this (v1.3.0.4)" in caplog.text assert "Used to do this and this (v1.3.0.4)" in caplog.text
assert "This is not an official package" in caplog.text
assert pytest_wrapped_e.type == SystemExit assert pytest_wrapped_e.type == SystemExit
assert pytest_wrapped_e.value.code == MISSING_TOOL assert pytest_wrapped_e.value.code == MISSING_TOOL