Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SPARK-1134 pyspark only uses ipython if started interactively #38

Closed
wants to merge 2 commits into from
Closed

SPARK-1134 pyspark only uses ipython if started interactively #38

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0309cf9
SPARK-1134 bug with ipython prevents non-interactive use with spark; …
Feb 27, 2014
b673bf7
Merge branch 'master' of github.com:apache/spark
Mar 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bin/pyspark
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ if [ -n "$IPYTHON_OPTS" ]; then
IPYTHON=1
fi

if [[ "$IPYTHON" = "1" ]] ; then
# Only use ipython if no command line arguments were provided [SPARK-1134]
if [[ "$IPYTHON" = "1" && $# = 0 ]] ; then
exec ipython $IPYTHON_OPTS
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we can, I'd like to remove IPYTHON_OPTS, since it makes it a little awkward to start the notebook server:

IPYTHON=1 IPYTHON_OPTS=notebook ./pyspark

versus

IPYTHON=1 ./pyspark notebook

else
exec "$PYSPARK_PYTHON" "$@"
Expand Down