Skip to content

Commit

Permalink
Remove no-longer used job which also calls updated mzmlentry method t…
Browse files Browse the repository at this point in the history
…he wrong, old way, and crashes the linter doing that
  • Loading branch information
glormph committed Apr 16, 2024
1 parent cddbef5 commit 23e665e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 27 deletions.
26 changes: 0 additions & 26 deletions src/backend/datasets/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,32 +195,6 @@ def process(self, **kwargs):
self.run_tasks.append(((run, params, nf_raws, ftype, nfwf.nfversion, profiles), {'pwiz_id': pwiz.id}))


class ConvertFileMzml(ConvertDatasetMzml):
# FIXME deprecate, no longer using this
refname = 'convert_single_mzml'

def getfiles_query(self, **kwargs):
return StoredFile.objects.select_related('rawfile__datasetrawfile__dataset').filter(pk=kwargs['sf_id'])

def process(self, **kwargs):
queue = kwargs.get('queue', settings.QUEUES_PWIZ[0])
fn = self.getfiles_query(**kwargs).get()
storageloc = fn.rawfile.datasetrawfile.dataset.storage_loc
pwiz = Proteowizard.objects.get(pk=kwargs['pwiz_id'])
mzsf = get_or_create_mzmlentry(fn, pwiz=pwiz)
if mzsf.servershare_id != fn.servershare_id:
# change servershare, in case of bugs the raw sf is set to tmp servershare
# then after it wont be changed when rerunning the job
mzsf.servershare_id = fn.servershare_id
mzsf.save()
if mzsf.checked:
pass
else:
options = ['--{}'.format(x) for x in kwargs.get('options', [])]
filters = [y for x in kwargs.get('filters', []) for y in ['--filter', x]]
self.run_tasks.append(((fn, mzsf, storageloc, options + filters, queue, settings.QUEUES_PWIZOUT[queue]), {}))


class DeleteDatasetMzml(DatasetJob):
"""Removes dataset mzml files from active storage"""
refname = 'delete_mzmls_dataset'
Expand Down
1 change: 0 additions & 1 deletion src/backend/jobs/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
dsjobs.MoveFilesToStorage,
dsjobs.MoveFilesStorageTmp,
dsjobs.ConvertDatasetMzml,
dsjobs.ConvertFileMzml,
dsjobs.DeleteActiveDataset,
dsjobs.DeleteDatasetMzml,
dsjobs.BackupPDCDataset,
Expand Down

0 comments on commit 23e665e

Please sign in to comment.