Merge branch 'develop'

qcr · Mar 17, 2021 · e04cf91 · e04cf91
2 parents 9e1cd82 + 47e1354
commit e04cf91
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/benchbot_supervisor/benchbot_supervisor.py b/benchbot_supervisor/benchbot_supervisor.py
@@ -78,9 +78,11 @@ def load(self):
         self.config['task'] = self.addons.get_match("tasks",
                                                     [("name", self.task_name)],
                                                     return_data=True)
-        self.config['results'] = self.addons.get_match(
-            "formats", [("name", self.config['task']['results_format'])],
-            return_data=True)
+        self.config['results'] = (
+            {} if 'results_format' not in self.config['task'] else
+            self.addons.get_match(
+                "formats", [("name", self.config['task']['results_format'])],
+                return_data=True))
         self.config['robot'] = self.addons.get_match(
             "robots", [("name", self.robot_name)], return_data=True)
         self.config['environments'] = [

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='benchbot_supervisor',
-    version='2.0.0',
+    version='2.1.0',
     author='Ben Talbot',
     author_email='[email protected]',
     description='The BenchBot Supervisor, used in the BenchBot Software Stack',
@@ -14,13 +14,7 @@
     packages=find_packages(),
     install_requires=['flask', 'gevent', 'pyyaml', 'requests'],
     classifiers=(
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
     ))