Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dask_jobqueue/htcondor.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ def __init__(self, *args, disk=None, job_extra=None, config_name=None, **kwargs)
"jobqueue.%s.env-extra" % self.config_name, default=[]
)
self.env_dict = self.env_lines_to_dict(env_extra)
self.env_dict["JOB_ID"] = "$F(MY.JobId)"

self.job_header_dict = {
"MY.DaskWorkerName": '"htcondor--$F(MY.JobId)--"',
Expand Down
1 change: 0 additions & 1 deletion dask_jobqueue/lsf.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ def __init__(
if walltime is not None:
header_lines.append("#BSUB -W %s" % walltime)
header_lines.extend(["#BSUB %s" % arg for arg in job_extra])
header_lines.append("JOB_ID=${LSB_JOBID%.*}")

# Declare class attribute that shall be overridden
self.job_header = "\n".join(header_lines)
Expand Down
1 change: 0 additions & 1 deletion dask_jobqueue/oar.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ def __init__(
full_resource_spec = ",".join(resource_spec_list)
header_lines.append("#OAR -l %s" % full_resource_spec)
header_lines.extend(["#OAR %s" % arg for arg in job_extra])
header_lines.append("JOB_ID=${OAR_JOB_ID}")

self.job_header = "\n".join(header_lines)

Expand Down
1 change: 0 additions & 1 deletion dask_jobqueue/pbs.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ def __init__(
header_lines.append("#PBS -e %s/" % self.log_directory)
header_lines.append("#PBS -o %s/" % self.log_directory)
header_lines.extend(["#PBS %s" % arg for arg in job_extra])
header_lines.append("JOB_ID=${PBS_JOBID%%.*}")

# Declare class attribute that shall be overridden
self.job_header = "\n".join(header_lines)
Expand Down
2 changes: 0 additions & 2 deletions dask_jobqueue/slurm.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ def __init__(
header_lines.append("#SBATCH -t %s" % walltime)
header_lines.extend(["#SBATCH %s" % arg for arg in job_extra])

header_lines.append("\nJOB_ID=${SLURM_JOB_ID%;*}")

# Declare class attribute that shall be overridden
self.job_header = "\n".join(header_lines)

Expand Down
1 change: 0 additions & 1 deletion dask_jobqueue/tests/test_htcondor.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ def test_job_script():
assert 'MY.JobId = "$(ClusterId).$(ProcId)"' in job_script
assert "LANG=en_US.utf8" in job_script
assert "LC_ALL=en_US.utf8" in job_script
assert "JOB_ID=$F(MY.JobId)" in job_script
assert "export" not in job_script
assert "+Extra = True" in job_script

Expand Down