Remove all __init__.py for PEP0420 compatibility

olofk · Dec 30, 2023 · 11a40e5 · 11a40e5
1 parent ecf2955
commit 11a40e5
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 28 deletions.
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -36,7 +36,12 @@
 author = "Olof Kindgren"
 
 # The full version, including alpha/beta/rc tags.
-release = fusesoc.__version__
+try:
+    from fusesoc.version import version as __version__
+except ImportError:
+    __version__ = "unknown"
+
+release = __version__
 # The short X.Y version.
 v_major, v_minor = LooseVersion(release).version[:2]
 version = f"{v_major}.{v_minor}"

diff --git a/fusesoc/__init__.py b/fusesoc/__init__.py
diff --git a/fusesoc/capi2/__init__.py b/fusesoc/capi2/__init__.py
diff --git a/fusesoc/capi2/core.py b/fusesoc/capi2/core.py
@@ -13,7 +13,7 @@
 
 from fusesoc import utils
 from fusesoc.capi2.coredata import CoreData
-from fusesoc.provider import get_provider
+from fusesoc.provider.provider import get_provider
 from fusesoc.vlnv import Vlnv
 
 logger = logging.getLogger(__name__)

diff --git a/fusesoc/config.py b/fusesoc/config.py
@@ -263,7 +263,7 @@ def write(self):
             self._cp.write(conf_file)
 
     def add_library(self, library):
-        from fusesoc.provider import get_provider
+        from fusesoc.provider.provider import get_provider
 
         section_name = "library." + library.name
 

diff --git a/fusesoc/librarymanager.py b/fusesoc/librarymanager.py
@@ -5,7 +5,7 @@
 import logging
 import os
 
-from fusesoc.provider import get_provider
+from fusesoc.provider.provider import get_provider
 
 logger = logging.getLogger(__name__)
 

diff --git a/fusesoc/main.py b/fusesoc/main.py
@@ -11,7 +11,10 @@
 import warnings
 from pathlib import Path
 
-from fusesoc import __version__
+try:
+    from fusesoc.version import version as __version__
+except ImportError:
+    __version__ = "unknown"
 
 # Check if this is run from a local installation
 fusesocdir = os.path.abspath(

diff --git a/fusesoc/parser/__init__.py b/fusesoc/parser/__init__.py
diff --git a/fusesoc/provider/__init__.py b/fusesoc/provider/__init__.py
diff --git a/fusesoc/provider/provider.py b/fusesoc/provider/provider.py
@@ -11,6 +11,12 @@
 
 logger = logging.getLogger(__name__)
 
+from importlib import import_module
+
+
+def get_provider(name):
+    return getattr(import_module(f"fusesoc.provider.{name}"), name.capitalize())
+
 
 class Provider:
     def __init__(self, config, core_root, files_root):