Correct import issues

Signed-off-by: Matthew Ballance <matt.ballance@gmail.com>

Author: mballance

src/ivpm/setup/__init__.py

@@ -1,2 +1,2 @@
 
-from .setup import setup
+from .wrapper import setup

src/ivpm/setup/build_ext.py

@@ -45,7 +45,7 @@ def build_extensions(self):
         super().build_extensions()
 
     def build_extension(self, ext):
-        from ivpm.setup.setup import get_hooks, Phase_BuildPre, Phase_BuildPost, expand_libvars, get_ivpm_ext_name_m
+        from ivpm.setup.ivpm_data import get_hooks, Phase_BuildPre, Phase_BuildPost, expand_libvars, get_ivpm_ext_name_m
         proj_dir = os.getcwd()
         print("build_extension: %s" % str(ext))
         include_dirs = getattr(ext, 'include_dirs', [])
@@ -82,7 +82,7 @@ def build_extension(self, ext):
         return ret
 
     def copy_extensions_to_source(self):
-        from ivpm.setup.setup import get_hooks, Phase_BuildPre, Phase_BuildPost, expand_libvars, get_ivpm_ext_name_m
+        from ivpm.setup.ivpm_data import get_hooks, Phase_BuildPre, Phase_BuildPost, expand_libvars, get_ivpm_ext_name_m
         """ Like the base class method, but copy libs into proper directory in develop. """
         print("copy_extensions_to_source")
         for hook in get_hooks(Phase_BuildPre):
@@ -239,7 +239,7 @@ def build_cmake(self, proj_dir):
         build_cmd[cmake_build_tool](self, build_dir, env)
         install_cmd[cmake_build_tool](self, build_dir, env)
 
-        from ivpm.setup.setup import get_ivpm_extdep_data
+        from ivpm.setup.ivpm_data import get_ivpm_extdep_data
         for src,dst in get_ivpm_extdep_data():
             shutil.copyfile(src, dst)
 

src/ivpm/setup/install_lib.py

@@ -27,8 +27,8 @@
 class InstallLib(_install_lib):
 
     def install(self):
-        import ivpm.setup.setup as ivpms
-        from ivpm.setup.setup import get_ivpm_extra_data, get_ivpm_ext_name_m, expand_libvars
+        from ivpm import setup as ivpms
+        from ivpm.setup.ivpm_data import get_ivpm_extra_data, get_ivpm_ext_name_m, expand_libvars
         # Assume 
         # May need to install some additional libraries and data
         # - data and/or include files to package 'share'
@@ -54,7 +54,7 @@ def install(self):
         for p in build_py.packages:
             if p in ivpm_extra_data.keys():
                 for spec in ivpm_extra_data[p]:
-                    src = ivpms.expand_libvars(spec[0])
+                    src = expand_libvars(spec[0])
                     dst = spec[1]
 
                     if os.path.isfile(src):

src/ivpm/setup/ivpm_data.py

@@ -0,0 +1,71 @@
+import os
+import platform
+
+Phase_SetupPre = "setup.pre"
+Phase_SetupPost = "setup.post"
+Phase_BuildPre = "build.pre"
+Phase_BuildPost = "build.post"
+
+_ivpm_extra_data = {}
+_ivpm_extdep_data = []
+_ivpm_hooks = {}
+_ivpm_ext_name_m = {}
+_package_dir = {}
+
+def get_hooks(kind : str):
+    global _ivpm_hooks
+    if kind in _ivpm_hooks.keys():
+        return _ivpm_hooks[kind]
+    else:
+        return []
+
+def get_ivpm_extra_data():
+    global _ivpm_extra_data
+    return _ivpm_extra_data
+
+def get_ivpm_extdep_data():
+    global _ivpm_extdep_data
+    return _ivpm_extdep_data
+
+def get_ivpm_ext_name_m():
+    global _ivpm_ext_name_m
+    return _ivpm_ext_name_m
+
+def get_package_dir():
+    return _package_dir
+
+
+
+def expand(subst_m, path):
+    elems = path.split("/")
+
+    # Perform path meta-variable substitution
+    for i,e in enumerate(elems):
+        found = True
+        while found:
+            found = False
+            for k in subst_m.keys():
+                if e.find(k) != -1:
+                    found = True
+                    e = e.replace(k, subst_m[k])
+                    elems[i] = e
+    return "/".join(elems)
+
+def expand_libvars(src):
+    libpref = "lib"
+    dllext = ".so"
+    if platform.system() == "Windows":
+        libpref = ""
+        dllext = ".dll"
+    elif platform.system() == "Darwin":
+        libpref = "lib"
+        dllext = ".dylib"
+
+    subst_m = {
+        "{libdir}" : "lib64" if os.path.isdir(os.path.join("build", "lib64")) else "lib",
+        "{libpref}" : libpref,
+        "{dllpref}" : libpref,
+        "{dllext}" : dllext
+    }
+
+    return expand(subst_m, src)

src/ivpm/setup/setup.py src/ivpm/setup/wrapper.py

@@ -29,73 +29,7 @@
 import inspect
 import platform
 from ivpm.pkg_info_rgy import PkgInfoRgy
-
-Phase_SetupPre = "setup.pre"
-Phase_SetupPost = "setup.post"
-Phase_BuildPre = "build.pre"
-Phase_BuildPost = "build.post"
-
-_ivpm_extra_data = {}
-_ivpm_extdep_data = []
-_ivpm_hooks = {}
-_ivpm_ext_name_m = {}
-
-def get_hooks(kind : str):
-    global _ivpm_hooks
-    if kind in _ivpm_hooks.keys():
-        return _ivpm_hooks[kind]
-    else:
-        return []
-
-def get_ivpm_extra_data():
-    global _ivpm_extra_data
-    return _ivpm_extra_data
-
-def get_ivpm_extdep_data():
-    global _ivpm_extdep_data
-    return _ivpm_extdep_data
-
-def get_ivpm_ext_name_m():
-    global _ivpm_ext_name_m
-    return _ivpm_ext_name_m
-
-_package_dir = {}
-def get_package_dir():
-    return _package_dir
-
-def expand(subst_m, path):
-    elems = path.split("/")
-
-    # Perform path meta-variable substitution
-    for i,e in enumerate(elems):
-        found = True
-        while found:
-            found = False
-            for k in subst_m.keys():
-                if e.find(k) != -1:
-                    found = True
-                    e = e.replace(k, subst_m[k])
-                    elems[i] = e
-    return "/".join(elems)
-
-def expand_libvars(src):
-    libpref = "lib"
-    dllext = ".so"
-    if platform.system() == "Windows":
-        libpref = ""
-        dllext = ".dll"
-    elif platform.system() == "Darwin":
-        libpref = "lib"
-        dllext = ".dylib"
-
-    subst_m = {
-        "{libdir}" : "lib64" if os.path.isdir(os.path.join("build", "lib64")) else "lib",
-        "{libpref}" : libpref,
-        "{dllpref}" : libpref,
-        "{dllext}" : dllext
-    }
-
-    return expand(subst_m, src)
+import ivpm.setup.ivpm_data as idata
 
 
 def setup(*args, **kwargs):
@@ -113,19 +47,19 @@ def setup(*args, **kwargs):
         debug = False
 
     if "ivpm_extra_data" in kwargs.keys():
-        _ivpm_extra_data = kwargs["ivpm_extra_data"]
+        idata._ivpm_extra_data = kwargs["ivpm_extra_data"]
         kwargs.pop("ivpm_extra_data")
 
     if "ivpm_extdep_data" in kwargs.keys():
-        _ivpm_extdep_data = kwargs["ivpm_extdep_data"]
+        idata._ivpm_extdep_data = kwargs["ivpm_extdep_data"]
         kwargs.pop("ivpm_extdep_data")
 
     if "ivpm_hooks" in kwargs.keys():
-        _ivpm_hooks = kwargs["ivpm_hooks"]
+        idata._ivpm_hooks = kwargs["ivpm_hooks"]
         kwargs.pop("ivpm_hooks")
 
     if "ivpm_ext_name_m" in kwargs.keys():
-        _ivpm_ext_name_m = kwargs["ivpm_ext_name_m"]
+        idata._ivpm_ext_name_m = kwargs["ivpm_ext_name_m"]
         kwargs.pop("ivpm_ext_name_m") 
 
     # project_dir = os.path.dirname(os.path.abspath(
@@ -213,12 +147,12 @@ def setup(*args, **kwargs):
             if hasattr(ext, "package_deps"):
                 print("package_deps")
 
-    for hook in get_hooks(Phase_SetupPre):
+    for hook in idata.get_hooks(idata.Phase_SetupPre):
         hook(None)
 
     _setup(*args, **kwargs)
 
-    for hook in get_hooks(Phase_SetupPost):
+    for hook in idata.get_hooks(idata.Phase_SetupPost):
         hook(None)
 
 def _collect_extdeps(