Merge pull request #29 from ohsu-comp-bio/log-bug

Fixing ExecutorLog/TaskLog mixup
ohsu-comp-bio · Jul 9, 2020 · d82a5d9 · d82a5d9
2 parents 277fb8b + 8a33791
commit d82a5d9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.coverage b/.coverage
diff --git a/tes/client.py b/tes/client.py
@@ -39,7 +39,7 @@ def __check_url(self, attribute, value):
         if u.scheme not in ["http", "https"]:
             raise ValueError(
                 "Unsupported URL scheme - must be one of [%s,%s]"
-                % (["http", "https"])
+                % ("http", "https")
             )
 
     def get_service_info(self):

diff --git a/tes/utils.py b/tes/utils.py
@@ -46,7 +46,7 @@ def unmarshal(j, o, convert_camel_case=True):
         "tasks": Task,
         "inputs": Input,
         "outputs": (Output, OutputFileLog),
-        "logs": (TaskLog, ExecutorLog),
+        "logs": (ExecutorLog, TaskLog),
         "resources": Resources,
         "executors": Executor
     }

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1,4 +1,4 @@
-coverage>=4.4.1
+coverage==4.5.4
 coveralls>=1.1
 flake8>=3.3.0
 nose>=1.3.7