Merge pull request #68 from siliconcompiler/fix

change to release with source files
siliconcompiler · Jul 30, 2024 · 86660f9 · 86660f9
2 parents c0aae8d + 84b8434
commit 86660f9
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 23 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -5,5 +5,3 @@ prune .github
 prune scripts
 prune docs
 prune tests
-prune lambdalib/padring/
-prune lambdalib/*lib/
diff --git a/lambdalib/__init__.py b/lambdalib/__init__.py
@@ -43,7 +43,7 @@ def __get_lambdalib_dir(la_lib):
     path_assert = Chip('lambdalib')
     _common.register_data_source(path_assert)
     lambdalib_path = sc_package.path(path_assert, 'lambdalib')
-    return f'{lambdalib_path}/lambdalib/{la_lib}/rtl'
+    return f'{lambdalib_path}/{la_lib}/rtl'
 
 
 def check(outputpath, la_lib='stdlib'):

diff --git a/lambdalib/_common.py b/lambdalib/_common.py
@@ -1,14 +1,5 @@
-import siliconcompiler.package as sc_package
-
-
-_version = "0.2.8"
+_version = "0.2.9"
 
 
 def register_data_source(chip):
-    sc_package.register_python_data_source(
-        chip,
-        "lambdalib",
-        "lambdalib",
-        "git+https://github.com/siliconcompiler/lambdalib.git",
-        alternative_ref=f"v{_version}",
-        python_module_path_append="..")
+    chip.register_source("lambdalib", "python://lambdalib")
diff --git a/lambdalib/auxlib/__init__.py b/lambdalib/auxlib/__init__.py
@@ -14,7 +14,7 @@ def setup(chip):
     lib = Library(chip, 'lambdalib_auxlib', package='lambdalib', auto_enable=True)
     register_data_source(lib)
 
-    lib.add('option', 'ydir', "lambdalib/auxlib/rtl")
+    lib.add('option', 'ydir', "auxlib/rtl")
 
     lib.use(stdlib)
 

diff --git a/lambdalib/fpgalib/__init__.py b/lambdalib/fpgalib/__init__.py
@@ -13,6 +13,6 @@ def setup(chip):
     lib = Library(chip, 'lambdalib_fpgalib', package='lambdalib', auto_enable=True)
     register_data_source(lib)
 
-    lib.add('option', 'ydir', "lambdalib/fpgalib/rtl")
+    lib.add('option', 'ydir', "fpgalib/rtl")
 
     return lib
diff --git a/lambdalib/iolib/__init__.py b/lambdalib/iolib/__init__.py
@@ -13,6 +13,6 @@ def setup(chip):
     lib = Library(chip, 'lambdalib_iolib', package='lambdalib', auto_enable=True)
     register_data_source(lib)
 
-    lib.add('option', 'ydir', "lambdalib/iolib/rtl")
+    lib.add('option', 'ydir', "iolib/rtl")
 
     return lib
diff --git a/lambdalib/padring/__init__.py b/lambdalib/padring/__init__.py
@@ -14,8 +14,8 @@ def setup(chip):
     lib = Library(chip, 'lambdalib_padring', package='lambdalib', auto_enable=True)
     register_data_source(lib)
 
-    lib.add('option', 'idir', "lambdalib/padring/rtl")
-    lib.add('option', 'ydir', "lambdalib/padring/rtl")
+    lib.add('option', 'idir', "padring/rtl")
+    lib.add('option', 'ydir', "padring/rtl")
 
     lib.use(iolib)
 

diff --git a/lambdalib/ramlib/__init__.py b/lambdalib/ramlib/__init__.py
@@ -14,7 +14,7 @@ def setup(chip):
     lib = Library(chip, 'lambdalib_ramlib', package='lambdalib', auto_enable=True)
     register_data_source(lib)
 
-    lib.add('option', 'ydir', "lambdalib/ramlib/rtl")
+    lib.add('option', 'ydir', "ramlib/rtl")
 
     lib.use(auxlib)
 

diff --git a/lambdalib/stdlib/__init__.py b/lambdalib/stdlib/__init__.py
@@ -13,6 +13,6 @@ def setup(chip):
     lib = Library(chip, 'lambdalib_stdlib', package='lambdalib', auto_enable=True)
     register_data_source(lib)
 
-    lib.add('option', 'ydir', "lambdalib/stdlib/rtl")
+    lib.add('option', 'ydir', "stdlib/rtl")
 
     return lib
diff --git a/lambdalib/syslib/__init__.py b/lambdalib/syslib/__init__.py
@@ -13,6 +13,6 @@ def setup(chip):
     lib = Library(chip, 'lambdalib_syslib', package='lambdalib', auto_enable=True)
     register_data_source(lib)
 
-    lib.add('option', 'ydir', "lambdalib/syslib/rtl")
+    lib.add('option', 'ydir', "syslib/rtl")
 
     return lib
diff --git a/lambdalib/vectorlib/__init__.py b/lambdalib/vectorlib/__init__.py
@@ -14,7 +14,7 @@ def setup(chip):
     lib = Library(chip, 'lambdalib_vectorlib', package='lambdalib', auto_enable=True)
     register_data_source(lib)
 
-    lib.add('option', 'ydir', "lambdalib/vectorlib/rtl")
+    lib.add('option', 'ydir', "vectorlib/rtl")
 
     lib.use(stdlib)