fixed pymas single varible code issue AND fixed automated test to match new tweaks of pymas

Author: Cloud User

src/sasctl/utils/pymas/core.py

@@ -76,7 +76,7 @@ def build_wrapper_function(func, variables, array_input, setup=None,
                   '        result = {}(inputrun)'.format(func))
     else:
         func_call = '{}({})'.format(func, ','.join(args))
-        middle = ('        result = {}'.format(func_call))
+        middle = ('        result = {}'.format(func_call),)
 
     # TODO: Verify that # of values returned by wrapped func matches length of output_names
     # TODO: cast all return types before returning (DS2 errors out if not exact match)

tests/integration/test_pymas.py

@@ -165,7 +165,7 @@ def test_from_pickle(train_data, pickle_file):
     
         if null(py) then do;
             py = _new_ pymas();
-            rc = py.useModule('mypymodule', 1);
+            rc = py.useModule('DF74A4B18C9E41A2A34B0053E123AA67', 1);
             if rc then do;
                 rc = py.appendSrcLine('try:');
                 rc = py.appendSrcLine('    import pickle, base64');
@@ -196,7 +196,7 @@ def test_from_pickle(train_data, pickle_file):
                 rc = py.appendSrcLine('    else: ');
                 rc = py.appendSrcLine('        return result, msg');
                 pycode = py.getSource();
-                revision = py.publish(pycode, 'mypymodule');
+                revision = py.publish(pycode, 'DF74A4B18C9E41A2A34B0053E123AA67');
                 if revision lt 1 then do;
                     logr.log('e', 'py.publish() failed.');
                     rc = -1;

tests/unit/test_pymas.py

@@ -357,7 +357,7 @@ def domath(a, b):
     d = py.getDouble('d');
 end;
 """
-    method = DS2PyMASMethod([
+    method = DS2PyMASMethod('mypymodule',[
         DS2Variable('a', 'double', False),
         DS2Variable('b', 'double', False),
         DS2Variable('c', 'double', True),
@@ -452,15 +452,15 @@ def test_ds2_package():
     
         if null(py) then do;
             py = _new_ pymas();
-            rc = py.useModule('mypymodule', 1);
+            rc = py.useModule('pyscore', 1);
             if rc then do;
                 rc = py.appendSrcLine('def domath(a, b):');
                 rc = py.appendSrcLine('    "Output: c, d"');
                 rc = py.appendSrcLine('    c = a * b');
                 rc = py.appendSrcLine('    d = a / b');
                 rc = py.appendSrcLine('    return c, d');
                 pycode = py.getSource();
-                revision = py.publish(pycode, 'mypymodule');
+                revision = py.publish(pycode, 'pyscore');
                 if revision lt 1 then do;
                     logr.log('e', 'py.publish() failed.');
                     rc = -1;