Merge branch 'master' of github.com:cadCAD-org/cadCAD

cadCAD/tools/execution/easy_run.py

@@ -16,6 +16,8 @@ def describe_or_return(v: object) -> object:
         return f'function: {v.__name__}'
     elif isinstance(v, types.LambdaType) and v.__name__ == '<lambda>':
         return f'lambda: {inspect.signature(v)}'
+    elif isinstance(v, list):
+        return str(v)
     else:
         return v
 

cadCAD/tools/preparation.py

@@ -26,7 +26,7 @@ def sweep_cartesian_product(sweep_params: SweepableParameters) -> SweepableParam
     transpose_cartesian_product = zip(*cartesian_product)
     zipped_sweep_params = zip(sweep_params.keys(), transpose_cartesian_product)
     sweep_dict = dict(zipped_sweep_params)
-    sweep_dict = {k: tuple(v) for k, v in sweep_dict.items()}
+    sweep_dict = {k: list(v) for k, v in sweep_dict.items()}
     return sweep_dict
 
 
@@ -70,4 +70,4 @@ def run(self, *args, **kwargs) -> DataFrame:
                           self.samples,
                           *args,
                           **kwargs)
-        return output
+        return output

setup.py

@@ -1,7 +1,9 @@
 from setuptools import find_packages, setup
 
-short_description = "cadCAD: a differential games based simulation software package for research, validation, and \
+short_description = (
+    "cadCAD: a differential games based simulation software package for research, validation, and \
         Computer Aided Design of economic systems"
+)
 
 long_description = """
 cadCAD (complex adaptive systems computer-aided design) is a python based, unified modeling framework for stochastic
@@ -21,7 +23,7 @@
 """
 
 name = "cadCAD"
-version = "0.5.1"
+version = "0.5.2"
 
 setup(
     name=name,
@@ -33,6 +35,15 @@
     author_email="[email protected]",
     license="LICENSE.txt",
     packages=find_packages(),
-    install_requires=["pandas", "funcy", "dill", "pathos", "numpy", "pytz", "six", "tqdm"],
+    install_requires=[
+        "pandas",
+        "funcy",
+        "dill",
+        "pathos",
+        "numpy",
+        "pytz",
+        "six",
+        "tqdm",
+    ],
     python_requires=">=3.9.0",
 )