8000 Address new comments · scikit-learn/scikit-learn@fcb1341 · GitHub
[go: up one dir, main page]

Skip to content

Commit fcb1341

Browse files
committed
Address new comments
1 parent 6ab7cf0 commit fcb1341

File tree

1 file changed

+18
-25
lines changed

1 file changed

+18
-25
lines changed

doc/install.rst

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,9 @@ There are different ways to get scikit-learn installed:
3131
Installing the latest release
3232
=============================
3333

34-
Scikit-learn requires:
35-
36-
- Python (>= 3.5)
37-
- NumPy (>= 1.11.0)
38-
- SciPy (>= 0.17.0)
39-
- joblib (>= 0.11)
40-
41-
Scikit-learn plotting capabilities (i.e., functions start with "plot\_"
42-
and classes end with "Display") require Matplotlib (>= 1.5.1). For running the
43-
examples Matplotlib >= 1.5.1 is required. A few examples require
44-
scikit-image >= 0.12.3, a few examples require pandas >= 0.18.0.
45-
46-
.. warning::
47-
48-
Scikit-learn 0.20 was the last version to support Python 2.7 and Python 3.4.
49-
Scikit-learn now requires Python 3.5 or newer.
50-
5134
If you already have a working installation of numpy and scipy,
52-
the easiest way to install scikit-learn is using ``conda`` (see the
53-
`instructions for downloading conda
54-
<https://docs.conda.io/projects/conda/en/latest/user-guide/install/download.html>`_)::
55-
56-
conda install scikit-learn
57-
58-
or ``pip``.
59-
In that case, in order to avoid any OS dependent issue it is strongly
35+
the easiest way to install scikit-learn is using ``pip``.
36+
In that case, in order to avoid modifying system state it is strongly
6037
recommended to use python3 ``virtualenv``
6138
(see `python3 virtualenv documentation
6239
<https://docs.python.org/3/tutorial/venv.html>`_).
@@ -73,6 +50,11 @@ or on Linux::
7350
source .myenv/bin/activate
7451
pip install -U scikit-learn
7552

53+
or ``conda`` (see the
54+
`instructions for downloading conda
55+
<https://docs.conda.io/projects/conda/en/latest/user-guide/install/download.html>`_)::
56+
57+
conda install scikit-learn
7658

7759
If you have not installed NumPy or SciPy yet, you can also install these using
7860
conda or pip. When using pip, please ensure that *binary wheels* are used,
@@ -83,6 +65,17 @@ a Raspberry Pi).
8365
If you must install scikit-learn and its dependencies with pip, you can install
8466
it as ``scikit-learn[alldeps]``.
8567

68+
Scikit-learn plotting capabilities (i.e., functions start with "plot\_"
69+
and classes end with "Display") require Matplotlib (>= 1.5.1). For running the
70+
examples Matplotlib >= 1.5.1 is required. A few examples require
71+
scikit-image >= 0.12.3, a few examples require pandas >= 0.18.0.
72+
73+
.. warning::
74+
75+
Scikit-learn 0.20 was the last version to support Python 2.7 and Python 3.4.
76+
Scikit-learn now requires Python 3.5 or newer.
77+
78+
8679
.. note::
8780

88 3AF7 81
For installing on PyPy, PyPy3-v5.10+, Numpy 1.14.0+, and scipy 1.1.0+

0 commit comments

Comments
 (0)
0