From 1c006fda4ec49c1070437762593391a9a4e2592e Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <MichielCottaar@protonmail.com>
Date: Wed, 10 Jun 2020 11:29:07 +0100
Subject: [PATCH] remove references of wait from tests, run.py and
documentation
---
fsl/utils/fslsub.py | 6 +-----
fsl/utils/run.py | 6 ------
tests/test_fslsub.py | 3 ---
3 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/fsl/utils/fslsub.py b/fsl/utils/fslsub.py
index 5433e58e3..c39723700 100644
--- a/fsl/utils/fslsub.py
+++ b/fsl/utils/fslsub.py
@@ -9,7 +9,7 @@ line tool. It is assumed that the computing cluster is managed by SGE.
Example usage, building a short pipeline::
- from fsl.utils.fslsub import submit, wait
+ from fsl.utils.fslsub import submit
# submits bet to veryshort queue unless <mask_filename> already exists
bet_job = submit('bet <input_filename> -m',
@@ -26,16 +26,12 @@ Example usage, building a short pipeline::
wait_for=(bet_job, other_job),
queue='cuda.q')
- # waits for the cuda job to finish
- wait(cuda_job)
-
.. autosummary::
:nosignatures:
submit
info
output
- wait
func_to_cmd
"""
diff --git a/fsl/utils/run.py b/fsl/utils/run.py
index e2adbeb8d..739d89ed2 100644
--- a/fsl/utils/run.py
+++ b/fsl/utils/run.py
@@ -15,7 +15,6 @@
run
runfsl
- wait
dryrun
"""
@@ -423,8 +422,3 @@ def wslcmd(cmdpath, *args):
else:
# Command was not found in WSL with this path
return None
-
-
-def wait(job_ids):
- """Proxy for :func:`.fslsub.wait`. """
- return fslsub.wait(job_ids)
diff --git a/tests/test_fslsub.py b/tests/test_fslsub.py
index 8e33d3824..94cff86f1 100644
--- a/tests/test_fslsub.py
+++ b/tests/test_fslsub.py
@@ -101,7 +101,6 @@ def test_submit():
os.chmod(cmd, 0o755)
jid = fslsub.submit(cmd)
- fslsub.wait(jid)
stdout, stderr = fslsub.output(jid)
assert stdout.strip() == 'standard output'
@@ -184,8 +183,6 @@ def test_func_to_cmd():
cmd = fslsub.func_to_cmd(myfunc, (), {})
jid = fslsub.submit(cmd)
- fslsub.wait(jid)
-
stdout, stderr = fslsub.output(jid)
assert stdout.strip() == 'standard output'
--
GitLab