cleanup python module and test

Author: gadfort

lambdalib/__init__.py

@@ -5,34 +5,34 @@
 import shutil
 __version__ = "0.1.5"
 
+_libraries = (
+    'iolib',
+    'stdlib',
+    'ramlib',
+    'padring',
+    'syslib',
+    'vectorlib'
+)
+
 
 ########################
 # SiliconCompiler Setup
 ########################
 def setup(chip):
     '''Lambdalib library setup script'''
 
-    dependencies = {
-        'iolib': [],
-        'stdlib': [],
-        'ramlib': ['stdlib'],
-        'padring': [],
-        'syslib': ['stdlib'],
-        'vectorlib': ['stdlib']
-    }
     add_idirs = ('padring',)
 
     libs = []
     # Iterate over all libs
-    for name, dep in dependencies.items():
+    for name in _libraries:
         lib = Library(chip, f'la_{name}', package='lambdalib')
         register_data_source(lib)
 
-        for path in [name]:
-            lib.add('option', 'ydir', f"lambdalib/{path}/rtl")
+        lib.add('option', 'ydir', f"lambdalib/{name}/rtl")
 
-            if path in add_idirs:
-                lib.add('option', 'idir', f"lambdalib/{path}/rtl")
+        if name in add_idirs:
+            lib.add('option', 'idir', f"lambdalib/{name}/rtl")
 
         libs.append(lib)
 

tests/test_setup.py

@@ -1,32 +1,32 @@
+import pytest
 from siliconcompiler import Chip
 
 import lambdalib
 
 
-def test_setup_without_depencency():
+@pytest.mark.parametrize('lib', lambdalib._libraries)
+def test_setup(lib):
     chip = Chip('<lib>')
     chip.use(lambdalib)
 
-    assert 'la_stdlib' in chip.getkeys('library')
+    lib_name = f'la_{lib}'
 
-    assert len(chip.get('library', 'la_stdlib', 'option', 'ydir')) == 1
+    assert lib_name in chip.getkeys('library')
+    assert len(chip.get('library', lib_name, 'option', 'ydir')) == 1
 
 
-def test_setup_with_depencency():
+@pytest.mark.parametrize(
+        'lib,has_idir',
+        [(lib, lib == 'padring') for lib in lambdalib._libraries])
+def test_setup_with_idir(lib, has_idir):
     chip = Chip('<lib>')
     chip.use(lambdalib)
 
-    assert 'la_stdlib' in chip.getkeys('library')
-    assert 'la_iolib' in chip.getkeys('library')
-    assert 'la_ramlib' in chip.getkeys('library')
+    lib_name = f'la_{lib}'
+    assert lib_name in chip.getkeys('library')
 
-    assert len(chip.get('library', 'la_ramlib', 'option', 'ydir')) == 2
+    excpect_idir = 0
+    if has_idir:
+        excpect_idir = 1
 
-
-def test_setup_with_idir():
-    chip = Chip('<lib>')
-    chip.use(lambdalib)
-
-    assert 'la_padring' in chip.getkeys('library')
-
-    assert len(chip.get('library', 'la_padring', 'option', 'idir')) == 1
+    assert len(chip.get('library', lib_name, 'option', 'idir')) == excpect_idir