[enh] regenerate code with external mpython-core dependency

johmedr · johmedr · commit fb17e45a005d · 2025-03-24T17:43:48.000-04:00
diff --git a/.mpython/templates/class_header.py b/.mpython/templates/class_header.py
@@ -1,4 +1,4 @@
-from <pkgname>.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class <classname>(MatlabClass):
diff --git a/pyproject.toml b/pyproject.toml
@@ -19,7 +19,8 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    "numpy"
+    "numpy", 
+    "mpython-core"
 ]
 
 [project.urls]
diff --git a/spm/__init__.py b/spm/__init__.py
@@ -1,12 +1,4 @@
-from .__wrapper__ import (
-    Runtime, 
-    MatlabClass,
-    Struct, 
-    Cell,
-    Array, 
-    SparseArray, 
-    helpers
-)
+from mpython import Runtime, MatlabClass, MatlabFunction, Cell, Struct, Array, SparseArray
 from .file_array import file_array
 from .gifti import gifti
 from .meeg import meeg
diff --git a/spm/__matlabbatch/cfg_branch.py b/spm/__matlabbatch/cfg_branch.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class cfg_branch(MatlabClass):
diff --git a/spm/__matlabbatch/cfg_choice.py b/spm/__matlabbatch/cfg_choice.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class cfg_choice(MatlabClass):
diff --git a/spm/__matlabbatch/cfg_const.py b/spm/__matlabbatch/cfg_const.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class cfg_const(MatlabClass):
diff --git a/spm/__matlabbatch/cfg_dep.py b/spm/__matlabbatch/cfg_dep.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class cfg_dep(MatlabClass):
diff --git a/spm/__matlabbatch/cfg_entry.py b/spm/__matlabbatch/cfg_entry.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class cfg_entry(MatlabClass):
diff --git a/spm/__matlabbatch/cfg_exbranch.py b/spm/__matlabbatch/cfg_exbranch.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class cfg_exbranch(MatlabClass):
diff --git a/spm/__matlabbatch/cfg_files.py b/spm/__matlabbatch/cfg_files.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class cfg_files(MatlabClass):
diff --git a/spm/__matlabbatch/cfg_intree.py b/spm/__matlabbatch/cfg_intree.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class cfg_intree(MatlabClass):
diff --git a/spm/__matlabbatch/cfg_inv_out.py b/spm/__matlabbatch/cfg_inv_out.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class cfg_inv_out(MatlabClass):
diff --git a/spm/__matlabbatch/cfg_item.py b/spm/__matlabbatch/cfg_item.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class cfg_item(MatlabClass):
diff --git a/spm/__matlabbatch/cfg_leaf.py b/spm/__matlabbatch/cfg_leaf.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class cfg_leaf(MatlabClass):
diff --git a/spm/__matlabbatch/cfg_mchoice.py b/spm/__matlabbatch/cfg_mchoice.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class cfg_mchoice(MatlabClass):
diff --git a/spm/__matlabbatch/cfg_menu.py b/spm/__matlabbatch/cfg_menu.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class cfg_menu(MatlabClass):
diff --git a/spm/__matlabbatch/cfg_repeat.py b/spm/__matlabbatch/cfg_repeat.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class cfg_repeat(MatlabClass):
diff --git a/spm/__tests/__init__.py b/spm/__tests/__init__.py
@@ -6,6 +6,7 @@
 from .spm_eeg_test_coverage import spm_eeg_test_coverage
 from .test_checkcode import test_checkcode
 from .test_gifti import test_gifti
+from .test_regress_fmri_glm_dcm import test_regress_fmri_glm_dcm
 from .test_regress_fmri_group import test_regress_fmri_group
 from .test_regress_spm_dcm_fmri import test_regress_spm_dcm_fmri
 from .test_regress_spm_distort_mesh import test_regress_spm_distort_mesh
diff --git a/spm/__tests/test_regress_fmri_glm_dcm.py b/spm/__tests/test_regress_fmri_glm_dcm.py
@@ -0,0 +1,19 @@
+from spm.__wrapper__ import Runtime
+
+
+def test_regress_fmri_glm_dcm(*args, **kwargs):
+    """
+      Regression test for GLM and DCM for fMRI including timseries extraction  
+        % This script analyses the Attention to Visual Motion fMRI dataset  
+        available from the SPM website using DCM:  
+          http://www.fil.ion.ucl.ac.uk/spm/data/attention/  
+        as described in the SPM docs website:  
+          https://www.fil.ion.ucl.ac.uk/spm/docs/tutorials/dcm/dcm_fmri_first_level_gui/  
+       __________________________________________________________________________  
+      
+
+    [Matlab code]( https://github.com/spm/spm/blob/main/tests/test_regress_fmri_glm_dcm.m )
+
+    Copyright (C) 1995-2025 Functional Imaging Laboratory, Department of Imaging Neuroscience, UCL
+    """
+    return Runtime.call("test_regress_fmri_glm_dcm", *args, **kwargs)
diff --git a/spm/_spm/__init__.py b/spm/_spm/__init__.py
@@ -117,14 +117,8 @@ def get_paths_from_os(self):
             raise RuntimeError('Operating system {0} is not supported.'.format(self.system))
 
         path_elements = []
-        
         if self.path_var in os.environ:
             path_elements = os.environ[self.path_var].split(os.pathsep)
-        
-        # On the Mac, do an additional check on DYLD_FALLBACK_LIBRARY_PATH environment variable
-        if not path_elements and self.system == 'Darwin':
-            path_elements = os.environ['DYLD_FALLBACK_LIBRARY_PATH'].split(os.pathsep)
-
         if not path_elements:
             if self.system == 'Darwin':
                 raise RuntimeError('On the Mac, you must run mwpython rather than python ' + 
diff --git a/spm/_spm/_spm.ctf b/spm/_spm/_spm.ctf
diff --git a/spm/file_array.py b/spm/file_array.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class file_array(MatlabClass):
diff --git a/spm/gifti.py b/spm/gifti.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class gifti(MatlabClass):
diff --git a/spm/meeg.py b/spm/meeg.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class meeg(MatlabClass):
diff --git a/spm/nifti.py b/spm/nifti.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class nifti(MatlabClass):
diff --git a/spm/slover.py b/spm/slover.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class slover(MatlabClass):
diff --git a/spm/xmltree.py b/spm/xmltree.py
@@ -1,4 +1,4 @@
-from spm.__wrapper__ import Runtime, MatlabClass
+from mpython import Runtime, MatlabClass
 
 
 class xmltree(MatlabClass):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from <pkgname>.__wrapper__ import Runtime, MatlabClass`
	`1`	`+from mpython import Runtime, MatlabClass`
`2`	`2`
`3`	`3`
`4`	`4`	`class <classname>(MatlabClass):`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ classifiers = [`
`19`	`19`	`"Programming Language :: Python :: 3.12",`
`20`	`20`	`]`
`21`	`21`	`dependencies = [`
`22`		`- "numpy"`
	`22`	`+ "numpy",`
	`23`	`+ "mpython-core"`
`23`	`24`	`]`
`24`	`25`
`25`	`26`	`[project.urls]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from spm.__wrapper__ import Runtime, MatlabClass`
	`1`	`+from mpython import Runtime, MatlabClass`
`2`	`2`
`3`	`3`
`4`	`4`	`class cfg_branch(MatlabClass):`