Update to beat.core 1.4.1

beat/cmdline/algorithms.py

@@ -187,7 +187,7 @@ To feed data from a database to an algorithm:
     },
     "outputs": {
         "<output_name>": {
-          "channel": "train"
+          "channel": "main"
         }
     },
     "parameters": {
@@ -214,7 +214,7 @@ To feed data from a file in the cache:
     },
     "outputs": {
         "<output_name>": {
-          "channel": "train"
+          "channel": "main"
         }
     },
     "parameters": {
@@ -313,7 +313,7 @@ def execute(prefix, cache, instructions_file):
     host = Host()
     host.setup(raise_on_errors=False)
 
-    executor = Executor(prefix, configuration, cache, dataformat_cache,
+    executor = Executor(host, prefix, configuration, cache, dataformat_cache,
                         database_cache, algorithm_cache)
 
     if not executor.valid:
@@ -322,7 +322,7 @@ def execute(prefix, cache, instructions_file):
 
     # Execute the algorithm
     with executor:
-      result = executor.process(host)
+      result = executor.process()
       if result['status'] != 0:
           print 'STDERR:'
           print result['stderr']

beat/cmdline/experiments.py

@@ -186,7 +186,7 @@ def run_experiment(configuration, name, force, use_docker, use_local):
         return 1
 
     if use_docker:
-      executor = DockerExecutor(configuration.path, value['configuration'],
+      executor = DockerExecutor(host, configuration.path, value['configuration'],
               configuration.cache, dataformat_cache, database_cache,
               algorithm_cache, library_cache)
     else:
@@ -194,7 +194,6 @@ def run_experiment(configuration, name, force, use_docker, use_local):
               configuration.cache, dataformat_cache, database_cache,
               algorithm_cache, library_cache, configuration.database_paths)
 
-
     if not executor.valid:
       logger.error("Failed to load the execution information for `%s':", key)
       for e in executor.errors: logger.error('  * %s', e)
@@ -212,10 +211,7 @@ def run_experiment(configuration, name, force, use_docker, use_local):
       logger.extra("  -> using fallback (default) environment")
 
     with executor:
-      if use_docker:
-        result = executor.process(host)
-      else:
-        result = executor.process()
+      result = executor.process()
 
     if use_docker:
       if result['status'] != 0:

beat/cmdline/test/instructions/algo_using_cached_files.json

@@ -15,7 +15,7 @@
     "parameters": {
     },
     "environment": {
-        "name": "environment",
-        "version": "1"
+        "name": "Python 2.7",
+        "version": "1.1.0"
     }
 }

beat/cmdline/test/instructions/algo_using_database.json

@@ -18,7 +18,7 @@
     "parameters": {
     },
     "environment": {
-        "name": "environment",
-        "version": "1"
+        "name": "Python 2.7",
+        "version": "1.1.0"
     }
 }

beat/cmdline/test/instructions/algo_using_database_and_cached_files.json

@@ -22,7 +22,7 @@
     "parameters": {
     },
     "environment": {
-        "name": "environment",
-        "version": "1"
+        "name": "Python 2.7",
+        "version": "1.1.0"
     }
 }

beat/cmdline/test/instructions/analyzer.json

@@ -10,7 +10,7 @@
     "parameters": {
     },
     "environment": {
-        "name": "environment",
-        "version": "1"
+        "name": "Python 2.7",
+        "version": "1.1.0"
     }
 }