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/15 23:27:04 UTC
git commit: Merge pull request #444 from mateiz/py-version
Updated Branches:
refs/heads/branch-0.9 e3fa36f25 -> 4ccedb3d1
Merge pull request #444 from mateiz/py-version
Clarify that Python 2.7 is only needed for MLlib
(cherry picked from commit 4f0c361b0e140f5f6879f019b2e1a16c683c705c)
Signed-off-by: Patrick Wendell <pw...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/4ccedb3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/4ccedb3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/4ccedb3d
Branch: refs/heads/branch-0.9
Commit: 4ccedb3d1d8c40d3ec914b2d17be9b43aa4744f4
Parents: e3fa36f
Author: Patrick Wendell <pw...@gmail.com>
Authored: Wed Jan 15 14:25:45 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Wed Jan 15 14:26:48 2014 -0800
----------------------------------------------------------------------
docs/mllib-guide.md | 3 ++-
docs/python-programming-guide.md | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/4ccedb3d/docs/mllib-guide.md
----------------------------------------------------------------------
diff --git a/docs/mllib-guide.md b/docs/mllib-guide.md
index 1a5c640..a22a221 100644
--- a/docs/mllib-guide.md
+++ b/docs/mllib-guide.md
@@ -21,7 +21,8 @@ depends on native Fortran routines. You may need to install the
if it is not already present on your nodes. MLlib will throw a linking error if it cannot
detect these libraries automatically.
-To use MLlib in Python, you will also need [NumPy](http://www.numpy.org) version 1.7 or newer.
+To use MLlib in Python, you will need [NumPy](http://www.numpy.org) version 1.7 or newer
+and Python 2.7.
# Binary Classification
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/4ccedb3d/docs/python-programming-guide.md
----------------------------------------------------------------------
diff --git a/docs/python-programming-guide.md b/docs/python-programming-guide.md
index b07899c..7c5283f 100644
--- a/docs/python-programming-guide.md
+++ b/docs/python-programming-guide.md
@@ -52,7 +52,7 @@ In addition, PySpark fully supports interactive use---simply run `./bin/pyspark`
# Installing and Configuring PySpark
-PySpark requires Python 2.7 or higher.
+PySpark requires Python 2.6 or higher.
PySpark applications are executed using a standard CPython interpreter in order to support Python modules that use C extensions.
We have not tested PySpark with Python 3 or with alternative Python interpreters, such as [PyPy](http://pypy.org/) or [Jython](http://www.jython.org/).
@@ -152,7 +152,7 @@ Many of the methods also contain [doctests](http://docs.python.org/2/library/doc
# Libraries
[MLlib](mllib-guide.html) is also available in PySpark. To use it, you'll need
-[NumPy](http://www.numpy.org) version 1.7 or newer. The [MLlib guide](mllib-guide.html) contains
+[NumPy](http://www.numpy.org) version 1.7 or newer, and Python 2.7. The [MLlib guide](mllib-guide.html) contains
some example applications.
# Where to Go from Here