You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2014/10/28 20:47:26 UTC
git commit: [SPARK-4065] Add check for IPython on Windows
Repository: spark
Updated Branches:
refs/heads/master 4d52cec21 -> 2f254dacf
[SPARK-4065] Add check for IPython on Windows
This issue employs logic similar to the bash launcher (pyspark) to check
if IPTYHON=1, and if so launch ipython with options in IPYTHON_OPTS.
This fix assumes that ipython is available in the system Path, and can
be invoked with a plain "ipython" command.
Author: Michael Griffiths <ms...@gmail.com>
Closes #2910 from msjgriffiths/pyspark-windows and squashes the following commits:
ef34678 [Michael Griffiths] Change build message to comply with [SPARK-3775]
361e3d8 [Michael Griffiths] [SPARK-4065] Add check for IPython on Windows
9ce72d1 [Michael Griffiths] [SPARK-4065] Add check for IPython on Windows
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2f254dac
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2f254dac
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2f254dac
Branch: refs/heads/master
Commit: 2f254dacf4b7ab9c59c7cef59fd364ca682162ae
Parents: 4d52cec
Author: Michael Griffiths <ms...@gmail.com>
Authored: Tue Oct 28 12:47:21 2014 -0700
Committer: Andrew Or <an...@databricks.com>
Committed: Tue Oct 28 12:47:21 2014 -0700
----------------------------------------------------------------------
bin/pyspark2.cmd | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/2f254dac/bin/pyspark2.cmd
----------------------------------------------------------------------
diff --git a/bin/pyspark2.cmd b/bin/pyspark2.cmd
index a0e66ab..59415e9 100644
--- a/bin/pyspark2.cmd
+++ b/bin/pyspark2.cmd
@@ -59,7 +59,12 @@ for /f %%i in ('echo %1^| findstr /R "\.py"') do (
)
if [%PYTHON_FILE%] == [] (
- %PYSPARK_PYTHON%
+ set PYSPARK_SHELL=1
+ if [%IPYTHON%] == [1] (
+ ipython %IPYTHON_OPTS%
+ ) else (
+ %PYSPARK_PYTHON%
+ )
) else (
echo.
echo WARNING: Running python applications through ./bin/pyspark.cmd is deprecated as of Spark 1.0.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org