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

Added KiCad 6 native symbols default dir

This commit is contained in:
Salvador E. Tropea 2022-01-07 17:49:33 -03:00
parent 562dd9c240
commit 8a4064a544
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kibot/kicad/config.py
View File

@ -178,7 +178,10 @@ class KiConf(object):
return None return None
def guess_symbol_dir(): def guess_symbol_dir():
return KiConf.guess_kicad_data_dir('library', 'KICAD_SYMBOL_DIR') guess = KiConf.guess_kicad_data_dir('library', 'KICAD_SYMBOL_DIR')
if guess is None:
guess = KiConf.guess_kicad_data_dir('symbols', 'KICAD_SYMBOL_DIR')
return guess
def guess_3d_dir(): def guess_3d_dir():
return KiConf.guess_kicad_data_dir(os.path.join('modules', 'packages3d'), 'KISYS3DMOD') return KiConf.guess_kicad_data_dir(os.path.join('modules', 'packages3d'), 'KISYS3DMOD')

5
tests/test_plot/test_kicad_config_errors.py
View File

@ -101,7 +101,7 @@ def test_kicad_conf_guess_libs(monkeypatch):
""" Check no HOME and fail to load kicad_common. """ Check no HOME and fail to load kicad_common.
Also check we correctly guess the libs dir. """ Also check we correctly guess the libs dir. """
res = check_load_conf(fail=True, no_conf_path=True) res = check_load_conf(fail=True, no_conf_path=True)
assert 'Detected KICAD_SYMBOL_DIR="/usr/share/kicad/library"' in res, res assert 'Detected KICAD_SYMBOL_DIR="/usr/share/kicad/' in res, res
def test_kicad_conf_lib_env(monkeypatch): def test_kicad_conf_lib_env(monkeypatch):
@ -148,7 +148,8 @@ def test_kicad_conf_local_conf(monkeypatch):
with monkeypatch.context() as m: with monkeypatch.context() as m:
m.setattr("sysconfig.get_path", mocked_get_path_1) m.setattr("sysconfig.get_path", mocked_get_path_1)
with context.cover_it(cov): with context.cover_it(cov):
assert KiConf.guess_symbol_dir() == '/usr/share/kicad/library' assert (KiConf.guess_symbol_dir() == '/usr/share/kicad/library' or
KiConf.guess_symbol_dir() == '/usr/share/kicad/symbols')
def test_kicad_conf_no_conf(): def test_kicad_conf_no_conf():