diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-09 20:29:51 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-09 20:29:51 -0800 |
| commit | 300eaa994c399a0c991c1e39b4dd864a7aa4bdc6 (patch) | |
| tree | bbc423ab189d43a809dd7b082cfc8fb00a60e2fe /docs/mllib-guide.md | |
| parent | 4b074fac054848ebd3397a3cce0a3e7871d3860c (diff) | |
| parent | 77ca9e1ba845c8cbb1566f803b591f6a826b0f1d (diff) | |
| download | spark-300eaa994c399a0c991c1e39b4dd864a7aa4bdc6.tar.gz spark-300eaa994c399a0c991c1e39b4dd864a7aa4bdc6.tar.bz2 spark-300eaa994c399a0c991c1e39b4dd864a7aa4bdc6.zip | |
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).
Diffstat (limited to 'docs/mllib-guide.md')
0 files changed, 0 insertions, 0 deletions