Merge branch 'development' of https://github.com/jakeogh/skidl into d…

…evdev

src/skidl/tools/kicad8/lib.py

@@ -88,11 +88,11 @@ def load_sch_lib(lib, filename=None, lib_search_paths_=None, lib_section=None):
         lib_section: Only used for SPICE simulations.
     """
 
-    from skidl import Part, KICAD7
+    from skidl import Part, KICAD8
     from skidl.tools import lib_suffixes
 
     # Try to open the file using allowable suffixes for the versions of KiCAD.
-    suffixes = lib_suffixes[KICAD7]
+    suffixes = lib_suffixes[KICAD8]
     base, suffix = os.path.splitext(filename)
     if suffix:
         # If an explicit file extension was given, use it instead of tool lib default extensions.
@@ -179,7 +179,7 @@ def load_sch_lib(lib, filename=None, lib_search_paths_=None, lib_section=None):
         lib.add_parts(
             Part(
                 part_defn=part_defn, # A list of lists that define the part.
-                tool=KICAD7,
+                tool=KICAD8,
                 dest=LIBRARY,
                 filename=filename,
                 name=part_name,
@@ -332,7 +332,7 @@ def parse_pins(symbol, unit_id):
 
         # Return true if the symbol had pins.
         return bool(symbol_pins)
-    
+
     def parse_draw_cmds(symbol):
         '''Return a list of graphic drawing commands contained in the symbol.'''
         return [
@@ -341,7 +341,7 @@ def parse_draw_cmds(symbol):
             if item[0].value().lower()
             in ("arc", "bezier", "circle", "pin", "polyline", "rectangle", "text")
         ]
-    
+
     # Parse top-level pins. (Pins in any units are parsed later.)
     parse_pins(part.part_defn, unit_id="main")
 

tests/unit_tests/test_cmds.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from skidl import search, set_default_tool, KICAD, KICAD6, KICAD7
+from skidl import search, set_default_tool, KICAD, KICAD6, KICAD7, KICAD8
 
 from .setup_teardown import setup_function, teardown_function
 
@@ -26,3 +26,9 @@ def test_search_3(capfd):
     search("ESP32")  # Should find 6 matches in RF_Module.kicad_sym.
     out, err = capfd.readouterr()
     assert out.count("RF_Module.kicad_sym:") == 6
+
+def test_search_4(capfd):
+    set_default_tool(KICAD8)
+    search("ESP32")  # Should find 6 matches in RF_Module.kicad_sym.
+    out, err = capfd.readouterr()
+    assert out.count("RF_Module.kicad_sym:") == 6

tests/unit_tests/test_lib.py

@@ -12,6 +12,7 @@
     KICAD,
     KICAD6,
     KICAD7,
+    KICAD8,
     SKIDL,
     TEMPLATE,
     Part,
@@ -31,7 +32,7 @@
 def test_missing_lib():
     # Sometimes, loading a part from a non-existent library doesn't throw an
     # exception until the second time it's tried. This detects that error.
-    
+
     # Don't allow searching backup lib that might exist from previous tests.
     SchLib.reset()
     skidl.config.query_backup_lib=False
@@ -285,4 +286,4 @@ def test_lib_kicad6_repository():
     lib_4xxx = SchLib(lib_name, tool=KICAD6)
     print("# of parts in {} = {}".format(lib_name, len(lib_4xxx.parts)))
     for part in lib_4xxx.parts:
-        check_lib_part(part)
+        check_lib_part(part)