diff --git a/docs/guides/configs-reference.rst b/docs/guides/configs-reference.rst index 19920d283..e96c70ded 100644 --- a/docs/guides/configs-reference.rst +++ b/docs/guides/configs-reference.rst @@ -49,13 +49,14 @@ See :py:meth:`mrjob.runner.MRJobRunner.__init__` for details. :py:class:`~mrjob.local.LocalMRJobRunner` takes no additional options, but: +* *bootstrap_mrjob* is ``False`` by default * *cmdenv* is combined with :py:func:`~mrjob.conf.combine_local_envs` * *python_bin* defaults to the current Python interpreter In addition, it ignores *hadoop_input_format*, *hadoop_output_format*, *hadoop_streaming_jar*, and *jobconf* -:py:class:`~mrjob.inline.InlineMRJobRunner` works like :py:class:`~mrjob.local.LocalMRJobRunner`, only it also ignores -*cmdenv*, *python_bin*, *setup_cmds*, *setup_scripts*, *steps_python_bin*, *upload_archives*, and *upload_files*. +:py:class:`~mrjob.inline.InlineMRJobRunner` works like :py:class:`~mrjob.local.LocalMRJobRunner`, only it also ignores +*bootstrap_mrjob*, *cmdenv*, *python_bin*, *setup_cmds*, *setup_scripts*, *steps_python_bin*, *upload_archives*, and *upload_files*. Additional options for :py:class:`~mrjob.emr.EMRJobRunner` diff --git a/mrjob/inline.py b/mrjob/inline.py index 9c030b89b..e103aa220 100644 --- a/mrjob/inline.py +++ b/mrjob/inline.py @@ -78,6 +78,7 @@ def __init__(self, mrjob_cls=None, **kwargs): # options that we ignore because they involve running subprocesses IGNORED_LOCAL_OPTS = [ + 'bootstrap_mrjob', 'python_bin', 'setup_cmds', 'setup_scripts',