You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/10 05:30:06 UTC
[3/3] git commit: Merge pull request #353 from
pwendell/ipython-simplify
Merge pull request #353 from pwendell/ipython-simplify
Simplify and fix pyspark script.
This patch removes compatibility for IPython < 1.0 but fixes the launch
script and makes it much simpler.
I tested this using the three commands in the PySpark documentation page:
1. IPYTHON=1 ./pyspark
2. IPYTHON_OPTS="notebook" ./pyspark
3. IPYTHON_OPTS="notebook --pylab inline" ./pyspark
There are two changes:
- We rely on PYTHONSTARTUP env var to start PySpark
- Removed the quotes around $IPYTHON_OPTS... having quotes
gloms them together as a single argument passed to `exec` which
seemed to cause ipython to fail (it instead expects them as
multiple arguments).
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/300eaa99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/300eaa99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/300eaa99
Branch: refs/heads/master
Commit: 300eaa994c399a0c991c1e39b4dd864a7aa4bdc6
Parents: 4b074fa 77ca9e1
Author: Patrick Wendell <pw...@gmail.com>
Authored: Thu Jan 9 20:29:51 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Thu Jan 9 20:29:51 2014 -0800
----------------------------------------------------------------------
bin/pyspark | 7 +------
docs/python-programming-guide.md | 5 +++--
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------