Merge branch 'development' into vscode_test_conf

tira-io · Sep 3, 2024 · 1bd3163 · 1bd3163
2 parents d520ccb + 9dbe9eb
commit 1bd3163
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/application/test/api_access_matrix.py b/application/test/api_access_matrix.py
@@ -2117,7 +2117,7 @@
             PARTICIPANT: 403,
             ORGANIZER_WRONG_TASK: 403,
             ORGANIZER: 403,
-            # ADMIN: 200,
+            # ADMIN: 200,  # TODO: replace with correct code once the POST is properly implemented
         },
     ),
     route_to_test(
@@ -2213,7 +2213,7 @@
             PARTICIPANT: 403,
             ORGANIZER_WRONG_TASK: 403,
             ORGANIZER: 403,
-            # ADMIN: 200,
+            # ADMIN: 200,  # TODO: replace with correct code once the POST is properly implemented
         },
     ),
     route_to_test(

diff --git a/python-client/tira/tira_run.py b/python-client/tira/tira_run.py
@@ -373,15 +373,15 @@ def main(args=None):
             print(f"Ensure that the input run {args.input_run} is available.")
             args.input_run = tira.get_run_output(args.input_run, dataset, True)
             print("Done: input run is available locally.")
-        if args.input_run and not isinstance(args.input_run, list) and len(args.input_run) > 0:
+        elif args.input_run and not isinstance(args.input_run, list) and len(args.input_run) > 0:
             temp_dir = "/tmp/" + tempfile.TemporaryDirectory().name
             os.makedirs(temp_dir, exist_ok=True)
             for num, input_run in zip(range(len(args.input_run)), args.input_run):
                 print(f"Ensure that the input run {input_run} is available.")
                 input_run = tira.get_run_output(input_run, dataset, True)
                 shutil.copytree(input_run, temp_dir + "/" + str(1 + num))
             args.input_run = temp_dir
-        if args.input_run_directory and "none" != args.input_run_directory.lower():
+        elif args.input_run_directory and "none" != args.input_run_directory.lower():
             args.input_run = os.path.abspath(args.input_run_directory)
 
         if args.evaluate: