aboutsummaryrefslogtreecommitdiff
path: root/docs/programming-guide.md
diff options
context:
space:
mode:
authorpshearer <pshearer@massmutual.com>2016-04-30 10:15:20 +0100
committerSean Owen <sowen@cloudera.com>2016-04-30 10:15:20 +0100
commit0368ff30dd55dd2127d4cb196898c7bd437e9d28 (patch)
treec432cd9e41334ba63c5e1a4d274794fbad22a4bc /docs/programming-guide.md
parent8dc3987d095ae01ad80c89b8f052f231e0807990 (diff)
downloadspark-0368ff30dd55dd2127d4cb196898c7bd437e9d28.tar.gz
spark-0368ff30dd55dd2127d4cb196898c7bd437e9d28.tar.bz2
spark-0368ff30dd55dd2127d4cb196898c7bd437e9d28.zip
[SPARK-13973][PYSPARK] Make pyspark fail noisily if IPYTHON or IPYTHON_OPTS are set
## What changes were proposed in this pull request? https://issues.apache.org/jira/browse/SPARK-13973 Following discussion with srowen the IPYTHON and IPYTHON_OPTS variables are removed. If they are set in the user's environment, pyspark will not execute and prints an error message. Failing noisily will force users to remove these options and learn the new configuration scheme, which is much more sustainable and less confusing. ## How was this patch tested? Manual testing; set IPYTHON=1 and verified that the error message prints. Author: pshearer <pshearer@massmutual.com> Author: shearerp <shearerp@umich.edu> Closes #12528 from shearerp/master.
Diffstat (limited to 'docs/programming-guide.md')
-rw-r--r--docs/programming-guide.md11
1 files changed, 6 insertions, 5 deletions
diff --git a/docs/programming-guide.md b/docs/programming-guide.md
index 601dd578f4..cf6f1d8914 100644
--- a/docs/programming-guide.md
+++ b/docs/programming-guide.md
@@ -240,16 +240,17 @@ use IPython, set the `PYSPARK_DRIVER_PYTHON` variable to `ipython` when running
$ PYSPARK_DRIVER_PYTHON=ipython ./bin/pyspark
{% endhighlight %}
-You can customize the `ipython` command by setting `PYSPARK_DRIVER_PYTHON_OPTS`. For example, to launch
-the [IPython Notebook](http://ipython.org/notebook.html) with PyLab plot support:
+To use the Jupyter notebook (previously known as the IPython notebook),
{% highlight bash %}
-$ PYSPARK_DRIVER_PYTHON=ipython PYSPARK_DRIVER_PYTHON_OPTS="notebook" ./bin/pyspark
+$ PYSPARK_DRIVER_PYTHON=jupyter ./bin/pyspark
{% endhighlight %}
-After the IPython Notebook server is launched, you can create a new "Python 2" notebook from
+You can customize the `ipython` or `jupyter` commands by setting `PYSPARK_DRIVER_PYTHON_OPTS`.
+
+After the Jupyter Notebook server is launched, you can create a new "Python 2" notebook from
the "Files" tab. Inside the notebook, you can input the command `%pylab inline` as part of
-your notebook before you start to try Spark from the IPython notebook.
+your notebook before you start to try Spark from the Jupyter notebook.
</div>