Skip to content

Commit

Permalink
Fix typos in job.py documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
jpfeil committed Jun 8, 2016
1 parent b89dc95 commit e4a2161
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
author_email='[email protected]',
url="https://github.com/BD2KGenomics/toil",
install_requires=[
'bd2k-python-lib==1.13.dev14'],
'bd2k-python-lib==1.13.dev14',
'dill==0.2.5'],
tests_require=[
Expand Down
4 changes: 2 additions & 2 deletions src/toil/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -2243,12 +2243,12 @@ def _serialiseJob(self, jobStore, jobsToJobWrappers, rootJobWrapper):
# method.
with jobStore.writeFileStream(rootJobWrapper.jobStoreID) as (fileHandle, fileStoreID):
cPickle.dump(self, fileHandle, cPickle.HIGHEST_PROTOCOL)
# Note that getUserScript() may have beeen overridden. This is intended. If we used
# Note that getUserScript() may have been overridden. This is intended. If we used
# self.userModule directly, we'd be getting a reference to job.py if the job was
# specified as a function (as opposed to a class) since that is where FunctionWrappingJob
# is defined. What we really want is the module that was loaded as __main__,
# and FunctionWrappingJob overrides getUserScript() to give us just that. Only then can
# filter_main() in _unpickle( ) do its job of resolveing any user-defined type or function.
# filter_main() in _unpickle( ) do its job of resolving any user-defined type or function.
userScript = self.getUserScript().globalize()
jobsToJobWrappers[self].command = ' '.join( ('_toil', fileStoreID) + userScript)
#Update the status of the jobWrapper on disk
Expand Down

0 comments on commit e4a2161

Please sign in to comment.