diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-15 14:25:45 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-15 14:25:45 -0800 |
| commit | 4f0c361b0e140f5f6879f019b2e1a16c683c705c (patch) | |
| tree | d06da1f5d1107ffaee696735face77671c809311 /docs | |
| parent | 59f475c79fc8fd6d3485e4d0adf6768b6a9225a4 (diff) | |
| parent | 2ffdaefbcb7a3471c548c0584003c9cbffa1d625 (diff) | |
| download | spark-4f0c361b0e140f5f6879f019b2e1a16c683c705c.tar.gz spark-4f0c361b0e140f5f6879f019b2e1a16c683c705c.tar.bz2 spark-4f0c361b0e140f5f6879f019b2e1a16c683c705c.zip | |
Merge pull request #444 from mateiz/py-version
Clarify that Python 2.7 is only needed for MLlib
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/mllib-guide.md | 3 | ||||
| -rw-r--r-- | docs/python-programming-guide.md | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/mllib-guide.md b/docs/mllib-guide.md index 1a5c640d10..a22a22184b 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 diff --git a/docs/python-programming-guide.md b/docs/python-programming-guide.md index b07899c2e1..7c5283fb0b 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 |